Fay.Liang
8cce7a082c
Merge branch 'omaha_15.1.1' of ssh://awips2omaha.com:29418/AWIPS2_baseline into int_15.1.1
...
Former-commit-id: fb0b41ff7b119e80d81e028bd8a768d6df335cf3
2015-05-13 15:11:13 -04:00
Fay.Liang
4bce2c0959
Merge branch 'asm_15.1.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into int_15.1.1
...
Conflicts:
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/PolygonUtil.java
Former-commit-id: 53eed5ee0c73100c13f7fef013bff6061db4815b
2015-05-13 15:08:24 -04:00
David Friedman
fb4faf96ec
ASM #17438 - WarnGen: improve performance logging
...
Change-Id: If0635087e542642883238e28481d8577c9d05f44
Former-commit-id: 9955a64e0d6902e50e6bc62c8e857e5d68451017
2015-05-13 17:24:27 +00:00
Shawn.Hooper
003c528458
ASM #17024 - Merge up to 14.4.1-38 into 15.1.1-10
...
Change-Id: Id4091550082328ce8a682db5ddd1a133fb7a5d39
Former-commit-id: 721a43ed8a1c9fdd1e5c62827869a91a20bfb416
2015-05-12 11:30:23 -04:00
David Friedman
61157be4f8
ASM #17310 - WarnGen: a large portion of hatched area was not included in polygon
...
Change-Id: I77c1a45f67e41e0ad0d9cdcca006f43c9f30e7f1
Former-commit-id: 7e97e943d7c6b291bf3e1b03540b623a8ec73677
2015-05-08 18:26:37 +00:00
Steve Harris
23cb520937
Merge tag 'OB_15.1.1-8' into omaha_16.1.1
...
15.1.1-7
Conflicts (these files were moved to AWIPS2_baseline):
rpms/awips2.core/Installer.java/build.sh
rpms/awips2.core/Installer.java/common/scripts/profile.d/awips2Java.sh
Former-commit-id: df806c9479cb29a5f47f1511ad70e140b2bbf8ec
2015-05-05 15:24:22 -05:00
Steve Harris
0a7e5a4474
Merge tag 'OB_15.1.1-8' into omaha_15.1.1
...
15.1.1-7
Former-commit-id: 56bb5952e20c8ff817d1ca05b68bf9a8424f6df9
2015-05-05 13:33:32 -05:00
Steve Harris
815a30871b
Merge branch 'omaha_15.1.1' into omaha_16.1.1
...
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/reference/MapManager.java
Former-commit-id: c6156764c2c4fb068f994cbb17d1f373d75f7070
2015-05-05 09:19:28 -05:00
David Friedman
4d729eee7d
ASM #17310 - WarnGen: a large portion of hatched area was not included in polygon
...
Change-Id: I4c6a98813149c01e6c878cc880f5e619937273dc
Former-commit-id: addc3cc1bfedd9c36e41319ca528b9dadceff390
2015-04-29 22:31:03 +00:00
Ron Anderson
551d1bee91
Omaha #4027 More changes for Mixed Case
...
Change-Id: Id47f1c68877e8df0cbf84df09bdaa000a41a863e
Former-commit-id: 0e48bfe4de5c227ebf96b0b59f9c7a9c39415f2e
2015-04-29 13:18:27 -05:00
Qinglu.Lin
8dc8977ab6
ASM #17359 - Warngen: it takes long time to get warning areas hatched when switching from Marine Weather Statement to Special Marine Warning
...
Change-Id: I02d432e4d335069a15700c9dc564bd19dbd14527
Former-commit-id: 3820522a7b6adb79f9eca4e75f66f93779ef7698
2015-04-28 10:37:29 -04:00
David Friedman
7d64814a37
ASM #17394 - WarnGen geometry generation can generate invalid geometry data
...
Change-Id: I811a9a0b26a8454aeead4a99056ddd58bfdc7bd1
Former-commit-id: fe5319f182be968f6757b5bd78e8e8b9198b145d
2015-04-24 19:58:37 +00:00
David Gillingham
5fddbf8ffe
Omaha #4353 : Remove log spam on Geometry validation errors.
...
Change-Id: I58f3c535e3fe582ea7402ad38d42a815823c099e
Former-commit-id: a8d6144ac52316c4e97c030c6b81cab20bbf7647
2015-04-02 16:34:22 -05:00
Fay.Liang
133a603566
Merge tag 'OB_14.4.1-20m' into master_15.1.1
...
14.4.1-20m
Conflicts:
cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/MonitoringAreaConfigDlg.java
edexOsgi/build.edex/esb/conf/logback.xml
edexOsgi/com.raytheon.uf.edex.archive/utility/common_static/base/archiver/purger/RAW_DATA.xml
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
Former-commit-id: 1d282a64da2998d91040a7c97f2e81beea0a8da4
2015-03-30 14:28:30 -04:00
Steve Harris
67b3a77c4f
Merge tag 'OB_14.4.1-18m' into omaha_15.1.1
...
14.4.1_18m
Conflicts:
edexOsgi/com.raytheon.uf.edex.archive/utility/common_static/base/archiver/purger/RAW_DATA.xml
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
Former-commit-id: 41217304fa68101d17e003b2fa6992d0e15b083c
2015-03-18 09:29:01 -05:00
Fay.Liang
e4269dfba4
Merge branch 'asm_14.4.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.1
...
Former-commit-id: ff4a350eca07ea0f158ca0c3082890faa5bda368
2015-03-13 15:58:28 -04:00
Steve Harris
85b687be0b
Merge tag 'OB_14.4.1-16m' into omaha_15.1.1
...
14.4.1-16m
Former-commit-id: 468600e9d5144873e5af1529ae0d38673e81bb17
2015-03-09 18:54:39 -05:00
David Friedman
3c45c2d158
ASM #17190 - Counties being listed twice in Zone based products with extra county entries in shapefile
...
Change-Id: Ie3cb35803e7ef08a4147d85c9a7f28b0476ce5a2
Former-commit-id: 6d8bd3315f48d188507a76092a950511a75c142c
2015-03-09 14:23:35 +00:00
Richard Peter
6224457b6e
Omaha #3353 - Fix warngen geometry generation blocking cave
...
Change-Id: I3c29747e0d9f0f265fbdab4e152b1739c42e26d0
Former-commit-id: 62410b8ce728440326997eab37a37a9650e51223
2015-02-26 16:45:18 -06:00
Richard Peter
b8becf24a3
Omaha #3353 - Fix warngen sync blocks on geospatial data.
...
Change-Id: I3d596030d4a06eb3e9cc8fbffa15ce5c596ed8ac
Former-commit-id: 4df7c51d45ca960f364d9b0a626e8ec1fd0c325c
2015-02-25 20:00:19 -06:00
David Lovely
8e5df4c6bc
Omaha #3954 Only draw "W" if the county is displayed.
...
Change-Id: I50f0fd9992ff86908d6980ef229aa283136c212f
Former-commit-id: 02286ee728cb5641470eef898a4a6c1e4b4aa1f6
2015-02-09 13:45:35 -06:00
Fay.Liang
eed6737801
ASM #15311 - Merge and Build Support - Merge ASM delivery into 14.4.1-1m.
...
Merge branch 'asm_14.4.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.1
Conflicts:
cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/SmartScript.py
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/ChooseDataPeriodDialog.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java
rpms/awips2.core/Installer.postgres/component.spec
rpms/awips2.core/Installer.python/component.spec
rpms/awips2.core/Installer.tools/component.spec
rpms/python.site-packages/Installer.h5py/component.spec
rpms/python.site-packages/Installer.matplotlib/component.spec
rpms/python.site-packages/Installer.nose/component.spec
rpms/python.site-packages/Installer.pupynere/component.spec
rpms/python.site-packages/Installer.qpid/component.spec
rpms/python.site-packages/Installer.scientific/component.spec
rpms/python.site-packages/Installer.scipy/component.spec
rpms/python.site-packages/Installer.shapely/component.spec
rpms/python.site-packages/Installer.tables/component.spec
Former-commit-id: 1f331890b8fc38b4f8ed3a3debc66b8fedba4fdd
2015-01-12 13:03:31 -05:00
Qinglu.Lin
baa96590f1
ASM #637 - Create a base level map bundle for the WarnGenLoc shape file
...
Change-Id: Id3285b04a2ae8e07acfe33d2f1f57a11b34c9f25
Former-commit-id: 06fdefbc5b528ddfb0bb8baddd85fe75e4d07864
2014-12-17 16:53:31 -05:00
Roger Ferrel
acbde703a2
Omaha #3353 Fix deadlock that freezes cave.
...
Change-Id: I4afa5c505178f30ada5dd58612b0703ab9529e6b
Former-commit-id: 871fa68ddf242f1e63286939b1324fc3197c7336
2014-11-04 14:13:29 -06:00
Steve Harris
f2fdf98d2f
Merge tag 'OB_14.3.1-26m' into omaha_14.4.1
...
Former-commit-id: 4be51191bc64978e3c455702bede3456666fbffe
2014-10-15 08:42:02 -05:00
Michael Gamazaychikov
e6d3baaa9c
ASM #513 - Maps loaded before opening WarnGen not retained when WarnGen is closed.
...
Change-Id: Iee5611826c4f26cec95daa6277c84a2e6a7ae410
Former-commit-id: dff1c1d6fcc5fd0572dd924cfdf7979fc2a18463
2014-10-06 15:32:10 -04:00
Steve Harris
2616fe04b6
Merge branch 'master_14.3.1' (14.3.1-23m) into omaha_14.4.1
...
Conflicts:
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/IFPClient.java
cave/com.raytheon.viz.volumebrowser/localization/menus/xml/planesMenusPlanView.xml
Issue #3648 :
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/IFPGridDatabase.java
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
Issue #3560 :
edexOsgi/com.raytheon.uf.common.registry.ebxml/src/com/raytheon/uf/common/registry/services/RegistryRESTServices.java
edexOsgi/com.raytheon.uf.common.registry.ebxml/src/com/raytheon/uf/common/registry/services/RegistrySOAPServices.java
Also modified with the resolution of #3560 :
edexOsgi/com.raytheon.uf.common.registry.ebxml/src/com/raytheon/uf/common/registry/services/RegistryServiceConfiguration.java
Former-commit-id: 8dc5abec482b4c1c3f3469c0ffc7e06fa697c6cd
2014-10-03 10:18:34 -05:00
dmsys
9f4560c480
Merge branch 'master_14.2.4' into master_14.3.1 CM-MERGE:14.2.4-13-14 into 14.3.1
...
Conflicts:
cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/IFPClient.java
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/specialWeatherStatement.vm
Former-commit-id: 0bf7ecb27d41f81f1d6727674fc1475eeaa8512c
2014-09-30 13:45:54 -04:00
Steve Harris
3b6a8a1447
Merge branch 'master_14.3.1' (14.3.1-22m) into omaha_14.4.1
...
Conflicts:
cave/com.raytheon.viz.volumebrowser/localization/menus/xml/fieldsMenus.xml
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/ohdlib/GagePP.java
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/T.xml
edexOsgi/com.raytheon.uf.tools.cli/impl/src/textdb/TextDB.py
Former-commit-id: c8b5d89c2e202e8bb4ad59d9ced8882ec8c2a6c1
2014-09-29 12:58:56 -05:00
David Friedman
05707d0f20
ASM #15658 - WarnGen: inclusion of watch information in marine products
...
Change-Id: I13d9e58b1df3dd434cdea66060dbc5886c0e27f2
Former-commit-id: 78cc67f9d2f86c2088ffc5695c4dea879a9e2ebb
2014-09-26 20:05:46 +00:00
David Friedman
db29ec9dec
ASM #15551 - WarnGen: only WCN should be used while including TOR/SVR watches in WarnGen products
...
Change-Id: I8b8e9ae40596e5a3d5f0aa44d2e946aa7a68a1ae
Former-commit-id: c8aa2fbfc35c872e2d50de2212eaf16db9b5483d
2014-09-26 15:13:56 +00:00
David Friedman
c85b0d1cfd
ASM #15551 - WarnGen: only WCN should be used while including TOR/SVR watches in WarnGen products
...
Change-Id: I1698025cad4310f8fc30938294c161c1f9797f03
Former-commit-id: 70b520c08670646047ffa753814f98c032938ff8
2014-09-26 13:07:28 +00:00
David Friedman
e82f96193e
ASM #16783 - Warngen: Possible problem when there are two effective VTEC actions for a watch
...
Change-Id: I76599d23396fe64c9448440787e67d752ed6b028
Former-commit-id: 117c2f072b647e353456832f2f0088d51a660d65
2014-09-25 22:10:42 +00:00
Qinglu.Lin
ef851d0016
ASM #15551 - WarnGen: only WCN should be used while including TOR/SVR watches in WarnGen products
...
Change-Id: I33fb6fab8d49aca4f12f76c763e5f3ddbd9272b5
Former-commit-id: 8b194664458246dad7509c44bcc07480cb088ddd
2014-09-25 15:16:42 -04:00
Brian.Dyke
87fa32d2d4
Merge branch 'master_14.2.4' into master_14.3.1 CM-MERGE:14.2.4-10-11-12 into 14.3.1
...
Conflicts:
cave/com.raytheon.viz.grid/localization/volumebrowser/FieldDisplayTypes.xml
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/GRID/HRRR/HRRR.xml
ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/ResourceFilters.xml
Former-commit-id: e04ad21771ce410beb25e15fe300a34796a1a062
2014-09-24 11:05:37 -04:00
David Friedman
2ee1ebe72d
ASM #15658 - WarnGen: inclusion of watch information in marine products
...
Change-Id: I545d1b07444c9ca00ea2e95c4ccaed79946bbead
Former-commit-id: e0f6cc70bf5258d66bfa8a4ddb1daf871b6c92c5
2014-09-23 18:39:22 +00:00
Steve Harris
4c56844e29
Merge branch 'omaha_14.3.1' into omaha_14.4.1
...
Conflicts:
cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/ArchiveRetentionDlg.java
cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/Cities.xml
cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/FAA/Airports.xml
cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/FAA/Fix.xml
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/BundleReflections.java
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/SubClassLocator.java
cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/ui/dialogs/FogMonitoringAreaConfigDlg.java
cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/ui/dialogs/SSMonitoringAreaConfigDlg.java
cave/com.raytheon.uf.viz.monitor.snow/src/com/raytheon/uf/viz/monitor/snow/ui/dialogs/SnowMonitoringAreaConfigDlg.java
cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/widgets/tearoff/MenuItemComposite.java
cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/widgets/tearoff/TearOffMenuDialog.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/ext/imaging/GLDataMappingFactory.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/DataManager.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/ParmManager.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/textformatter/CombinationsFileUtil.java
cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/graphic/RadarGraphicsPage.java
cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/mosaic/RadarMosaicResource.java
cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/ui/xy/RadarGSMResource.java
cave/com.raytheon.viz.ui.personalities.awips/src/com/raytheon/viz/ui/personalities/awips/AbstractCAVEComponent.java
cave/com.raytheon.viz.ui/META-INF/MANIFEST.MF
cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/colormap/ColorMapTree.java
cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/dialogs/ColormapComp.java
cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/dialogs/ImagingDialog.java
cave/com.raytheon.viz.volumebrowser/localization/menus/xml/fieldsMenus.xml
cave/com.raytheon.viz.volumebrowser/localization/menus/xml/planesMenusPlanView.xml
cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
edexOsgi/com.raytheon.uf.common.datadelivery.registry/src/com/raytheon/uf/common/datadelivery/registry/web/IRegistryFederationManager.java
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TP.xml
edexOsgi/com.raytheon.uf.common.localization/src/com/raytheon/uf/common/localization/IPathManager.java
edexOsgi/com.raytheon.uf.common.localization/src/com/raytheon/uf/common/localization/PathManager.java
edexOsgi/com.raytheon.uf.edex.datadelivery.registry/src/com/raytheon/uf/edex/datadelivery/registry/dao/ReplicationEventDao.java
edexOsgi/com.raytheon.uf.edex.datadelivery.registry/src/com/raytheon/uf/edex/datadelivery/registry/federation/RegistryFederationManager.java
edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/util/WfsConnectionUtil.java
Former-commit-id: 69c52fb4a22997d0a0f9c620bd20f00b8c5fd4ce
2014-09-19 10:28:57 -05:00
Qinglu.Lin
c2047b94b1
ASM #15465 - No variable for failed site's MND Header location available for WarnGen to use
...
Change-Id: I8bc59786379680f635e85917eebf4c9d6b4ea683
Former-commit-id: f79ed1b1867b5516a390a8f70b2141052be3eb38
2014-09-18 11:21:18 -04:00
Qinglu.Lin
5e93999662
ASM #15551 - WarnGen: only WCN should be used while including TOR/SVR watches in WarnGen products
...
Change-Id: Ia4350f8c17166c8f972779f8bde1763ec4cd3bd5
Former-commit-id: e7ab29fbfebb1943e0b0702547dbd353367e797d
2014-09-17 10:26:25 -04:00
Matthew Howard
6e0d48d840
Merge "ASM #641 - Filtered cases where Areas do not match Zones." into asm_14.3.1
...
Former-commit-id: f33abc302597a3120c9220278e28d865d5f185b6
2014-09-15 15:03:36 -05:00
Daniel.Huffman
0f30c0f897
ASM #641 - Filtered cases where Areas do not match Zones.
...
Change-Id: I1207442f77aece9d79b010669755ee7fc6f82362
Former-commit-id: bf6acaafc42ba98e4257d3eb089b7a1e7adf7bd4
2014-09-15 19:18:33 +00:00
Roger Ferrel
bab69dc58c
Omaha #3353 Fix null pointer opening GenerateGeoDataSetDialog.
...
Former-commit-id: f7fe3c9351d354046ef5038ae561db469421a442
2014-09-15 13:00:02 -05:00
Brian.Dyke
1541e4c255
Merge branch 'master_14.3.1' into asm_14.3.1
...
Former-commit-id: 8e4f6e96f7b70d6f2b7517f3f0695350506169c7
2014-09-15 10:46:25 -04:00
David Friedman
bed361fe35
ASM #16730 - WarnGen Watch wording error when issuing product only over Marine Locations
...
Change-Id: I361a1635cf11f3c66801f33c74034028b3e0271d
Former-commit-id: 17d27fca04fb733d74e5bac99bfed3112bd81b6c
2014-09-10 19:28:57 +00:00
Brian.Dyke
01dfe503f5
Merge branch 'master_14.2.4' into master_14.3.1 CM-MERGE:14.2.4-6-7-8 into 14.3.1
...
Conflicts:
cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/ArchiveRetentionDlg.java
cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/widgets/tearoff/MenuItemComposite.java
Former-commit-id: a3365943e7b7972a5c86f8cb1ad39667ab9e0695
2014-09-09 11:44:30 -04:00
Qinglu.Lin
902b6c55bd
ASM #15551 - WarnGen: only WCN should be used while including TOR/SVR watches in WarnGen products
...
Change-Id: I0438af111b0db290373c7553006002edec2b2110
Former-commit-id: 33adaf353c6a4b7dc418dc86428257dae260c4c5
2014-09-04 14:09:24 -04:00
Nate Jensen
9d462e1dd9
Omaha #3356 remove more unnecessary register buddies and policies
...
Change-Id: I3e39f9b8274b2b9104f3b3d037601c1553c43e13
Former-commit-id: b535d54c52c3e38bb9fa083ba911ad49c090f214
2014-09-03 11:34:10 -05:00
Ben Steffensmeier
e32037b42a
Omaha #3390 Remove references to deprecated API.
...
Former-commit-id: ec7eeeb08af2cbad5d7880ae17ba7b351de23dc3
2014-09-02 15:39:45 -05:00
Qinglu.Lin
ae13ea419e
ASM #15551 - WarnGen: only WCN should be used while including TOR/SVR watches in WarnGen products
...
Change-Id: I286bc4cc809fcc9257f72051f1bb74f8acc24c05
Former-commit-id: 59890eef397f3282ef26f259ca85ffea3db7b710
2014-09-02 14:37:19 -04:00
Steve Harris
5d58625abc
Merge branch 'master_14.3.1' (14.3.1-16) into omaha_14.4.1
...
Conflicts:
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/BundleReflections.java
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/BundleRepositoryGetter.java
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/SubClassLocator.java
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java
cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
edexOsgi/com.raytheon.edex.plugin.binlightning/src/com/raytheon/edex/plugin/binlightning/BinLightningDecoder.java
edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java
edexOsgi/com.raytheon.uf.tools.cli/impl/capture
ldm/src/pqact/pqact.c
Former-commit-id: 8793dca41f756ba812206b48391caea6e593a657
2014-08-29 10:17:52 -05:00
