Brian.Dyke
|
d59e657f7d
|
Merge branch 'ncep_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: 3791bd2cae [formerly 9fc3eb20c1] [formerly 6ad8d500ef] [formerly 3791bd2cae [formerly 9fc3eb20c1] [formerly 6ad8d500ef] [formerly 9c33ae6d2c [formerly 6ad8d500ef [formerly e895f7927a95c2416c05953e131d9e0c6095beb3]]]]
Former-commit-id: 9c33ae6d2c
Former-commit-id: b7e59206c0 [formerly a97370769f] [formerly 5a05794d1c03691d1fb43dc90829680f320709fc [formerly 3b48d6368d]]
Former-commit-id: 2ea91b5d02b51b05412fa8227d82fc67b6fdb6af [formerly 2a456a1b9b]
Former-commit-id: d1c45356d3
|
2014-09-19 14:42:29 -04:00 |
|
Brian.Dyke
|
3791bd2cae
|
Merge branch 'ncep_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: 9c33ae6d2c [formerly 6ad8d500ef [formerly e895f7927a95c2416c05953e131d9e0c6095beb3]]
Former-commit-id: 6ad8d500ef
Former-commit-id: 9fc3eb20c1
|
2014-09-19 14:42:29 -04:00 |
|
Darrel Kingfield
|
bb517865e2
|
VLab Issue #4603 - MRMS SBN Display initial code check-in v3 - update purge rules; fixes #4603
Change-Id: Ic38722b3080edc3f9a9f8d35d4b2271d34b63872
Former-commit-id: 48387a6bcf [formerly 3eeaa8f359] [formerly 1cabae50b1] [formerly 48387a6bcf [formerly 3eeaa8f359] [formerly 1cabae50b1] [formerly 88a8dddef3 [formerly 1cabae50b1 [formerly a9bc901ed4b9157a4cb1a042d5fabe628cfd4b2a]]]]
Former-commit-id: 88a8dddef3
Former-commit-id: 3fc3c878ce [formerly b5e546503c] [formerly 84f67f72b73c8e8a6bab68a5c1c18d696b14b730 [formerly 00a056c154]]
Former-commit-id: be0abf007625df1407024754c3cb657219086d15 [formerly 142edfe588]
Former-commit-id: 11fd795d32
|
2014-09-19 11:14:09 -05:00 |
|
Darrel Kingfield
|
48387a6bcf
|
VLab Issue #4603 - MRMS SBN Display initial code check-in v3 - update purge rules; fixes #4603
Change-Id: Ic38722b3080edc3f9a9f8d35d4b2271d34b63872
Former-commit-id: 88a8dddef3 [formerly 1cabae50b1 [formerly a9bc901ed4b9157a4cb1a042d5fabe628cfd4b2a]]
Former-commit-id: 1cabae50b1
Former-commit-id: 3eeaa8f359
|
2014-09-19 11:14:09 -05:00 |
|
Steve Harris
|
b316e73f24
|
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: e3a7796362 [formerly da530db540] [formerly 091555cf10] [formerly e3a7796362 [formerly da530db540] [formerly 091555cf10] [formerly 4c56844e29 [formerly 091555cf10 [formerly 69c52fb4a22997d0a0f9c620bd20f00b8c5fd4ce]]]]
Former-commit-id: 4c56844e29
Former-commit-id: a1bf8ecdb1 [formerly 84a98ec4ca] [formerly 275a024694cc566f868a949d844ab91490e424f6 [formerly 214b48dcb8]]
Former-commit-id: 9adb015794435a13e656ce09cd891bfd9e4d53db [formerly fdc523a026]
Former-commit-id: f4ea796cea
|
2014-09-19 10:28:57 -05:00 |
|
Steve Harris
|
e3a7796362
|
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: 4c56844e29 [formerly 091555cf10 [formerly 69c52fb4a22997d0a0f9c620bd20f00b8c5fd4ce]]
Former-commit-id: 091555cf10
Former-commit-id: da530db540
|
2014-09-19 10:28:57 -05:00 |
|
Brian.Dyke
|
845a9cb390
|
Merge branch 'ops_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: 80f677e1e3 [formerly 1c0d6624a3] [formerly e1c88f287a] [formerly 80f677e1e3 [formerly 1c0d6624a3] [formerly e1c88f287a] [formerly 57a361073d [formerly e1c88f287a [formerly 5703d4fbb0fa5e422e3fbd62529928091a2bdb1f]]]]
Former-commit-id: 57a361073d
Former-commit-id: bf6931a113 [formerly 47feda6450] [formerly 56e8b90c211d77cd58bb224d0ec60bd67aba968d [formerly 4476b9d19e]]
Former-commit-id: ef186b2221b07e34cc32e9dc0106aff32d72736c [formerly 7e53a1d558]
Former-commit-id: c95be437eb
|
2014-09-17 15:50:13 -04:00 |
|
Brian.Dyke
|
80f677e1e3
|
Merge branch 'ops_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: 57a361073d [formerly e1c88f287a [formerly 5703d4fbb0fa5e422e3fbd62529928091a2bdb1f]]
Former-commit-id: e1c88f287a
Former-commit-id: 1c0d6624a3
|
2014-09-17 15:50:13 -04:00 |
|
Nate Jensen
|
55512ac35c
|
Omaha #3356 fix ingestGrib level factory initialization order
Change-Id: Iaad6d7aa9999f8387ed32806c655e5dee7e6a985
Former-commit-id: 85951c3aff [formerly 877aab446c] [formerly b516c4b8c8] [formerly 85951c3aff [formerly 877aab446c] [formerly b516c4b8c8] [formerly b89781c419 [formerly b516c4b8c8 [formerly 0ed8b10495a08f1f120cfb3ed4e99e011e3db5a2]]]]
Former-commit-id: b89781c419
Former-commit-id: 8be2eed541 [formerly 5d7897e9bc] [formerly 23dd78b2611da0c58f39ffed2d491a487063803a [formerly 57851af7d6]]
Former-commit-id: e076ec73db31c9b92c1ec0446652f600678ac239 [formerly 1370795313]
Former-commit-id: 89ea61abb0
|
2014-09-16 13:24:46 -05:00 |
|
Nate Jensen
|
85951c3aff
|
Omaha #3356 fix ingestGrib level factory initialization order
Change-Id: Iaad6d7aa9999f8387ed32806c655e5dee7e6a985
Former-commit-id: b89781c419 [formerly b516c4b8c8 [formerly 0ed8b10495a08f1f120cfb3ed4e99e011e3db5a2]]
Former-commit-id: b516c4b8c8
Former-commit-id: 877aab446c
|
2014-09-16 13:24:46 -05:00 |
|
Stephen Gilbert
|
9d6570b9f5
|
Merge remote branch 'origin/master_14.3.1' into ncep_14.3.1
Former-commit-id: aa11ac6e09 [formerly e7d21b0293] [formerly 5bf2ed644a] [formerly aa11ac6e09 [formerly e7d21b0293] [formerly 5bf2ed644a] [formerly 440bddda4b [formerly 5bf2ed644a [formerly 2cf0da849d50a31d2ca54efeaf6e0258f33ff1d3]]]]
Former-commit-id: 440bddda4b
Former-commit-id: d9a222f1ef [formerly 1ceed41334] [formerly 0680c0d2a7310de845600fb7564e790bfd925534 [formerly eee81971cc]]
Former-commit-id: 468aa5036ea727433d05f2dfe4b23fee88875480 [formerly 3106a4006c]
Former-commit-id: 99796454d2
|
2014-09-15 13:20:34 -04:00 |
|
Stephen Gilbert
|
aa11ac6e09
|
Merge remote branch 'origin/master_14.3.1' into ncep_14.3.1
Former-commit-id: 440bddda4b [formerly 5bf2ed644a [formerly 2cf0da849d50a31d2ca54efeaf6e0258f33ff1d3]]
Former-commit-id: 5bf2ed644a
Former-commit-id: e7d21b0293
|
2014-09-15 13:20:34 -04:00 |
|
Brian.Dyke
|
c8f3fbfa22
|
Merge branch 'master_14.3.1' into asm_14.3.1
Former-commit-id: eb63c3e61a [formerly 54b26b3616] [formerly 216f34fb25] [formerly eb63c3e61a [formerly 54b26b3616] [formerly 216f34fb25] [formerly 1541e4c255 [formerly 216f34fb25 [formerly 8e4f6e96f7b70d6f2b7517f3f0695350506169c7]]]]
Former-commit-id: 1541e4c255
Former-commit-id: f2750cb31f [formerly 5115becdef] [formerly f7dde4d7662c0fb29ffb1d09bf474a5e8a04ae17 [formerly ffa56ef950]]
Former-commit-id: 4de6d3d3fa8ae33113a69367f47a1402cf7fe844 [formerly 26b1938813]
Former-commit-id: 55a25f2525
|
2014-09-15 10:46:25 -04:00 |
|
Brian.Dyke
|
eb63c3e61a
|
Merge branch 'master_14.3.1' into asm_14.3.1
Former-commit-id: 1541e4c255 [formerly 216f34fb25 [formerly 8e4f6e96f7b70d6f2b7517f3f0695350506169c7]]
Former-commit-id: 216f34fb25
Former-commit-id: 54b26b3616
|
2014-09-15 10:46:25 -04:00 |
|
Stephen Gilbert
|
630efbf2f9
|
Merge branch 'ncep_14.2.1-n' into ncep_14.3.1
Conflicts:
cave/build/cave/customTargets.xml
edexOsgi/build.edex/opt/db/ddl/ncep/loadVors.sql
edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_NCEP-7.xml
edexOsgi/com.raytheon.uf.tools.cli/impl/src/pgen/ActivityUtil.py
ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/calculation/CalcEach1min.java
ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/calculation/CalcEach3hr.java
ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/calculation/CalcKp.java
ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/calculation/CalcUtil.java
ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/request/DatabaseUtil.java
ncep/gov.noaa.nws.ncep.edex.common/src/gov/noaa/nws/ncep/edex/common/sounding/NcSoundingLayer.java
ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/remoteScripts/baseScript-1
ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/remoteScripts/test_script
ncep/gov.noaa.nws.ncep.edex.plugin.aww/src/gov/noaa/nws/ncep/edex/plugin/aww/util/AwwParser.java
ncep/gov.noaa.nws.ncep.edex.plugin.geomag/res/spring/geomag-request.xml
ncep/gov.noaa.nws.ncep.edex.plugin.geomag/src/gov/noaa/nws/ncep/edex/plugin/geomag/TrigKCalculation.java
ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/res/spring/ncgrib-file-endpoint.xml
ncep/gov.noaa.nws.ncep.ui.nctextui/src/gov/noaa/nws/ncep/ui/nctextui/dbutil/NctextDbQuery.java
ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/NsharpConstants.java
ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/display/rsc/NsharpDataPaneResource.java
ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/display/rsc/NsharpResourceHandler.java
ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/display/rsc/NsharpSkewTPaneResource.java
ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/natives/NsharpNative.java
ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/natives/NsharpNativeConstants.java
ncep/gov.noaa.nws.ncep.ui.pgen/localization/ncep/pgen/xslt/prod/f000.xslt
ncep/gov.noaa.nws.ncep.ui.pgen/localization/ncep/pgen/xslt/prod/f000_hires.xslt
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/attrdialog/ContoursAttrDlg.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/contours/Contours.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/controls/RetrieveActivityDialog.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/controls/StoreActivityDialog.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/display/DisplayElementFactory.java
ncep/gov.noaa.nws.ncep.viz.common/src/gov/noaa/nws/ncep/viz/common/ui/HILORelativeMinAndMaxLocator.java
ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SURFACE/SHIP6HR/SHIP6HR.xml
ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/contours/ContourSupport.java
ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/rsc/NcgridResource.java
ncep/gov.noaa.nws.ncep.viz.rsc.ncscat/src/gov/noaa/nws/ncep/viz/rsc/ncscat/rsc/NcscatResource.java
ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcCGM.java
ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcCharacterHeight.java
ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcCircleElement.java
ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcCommand.java
ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcFillColour.java
ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcInteriorStyle.java
ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcLineColour.java
ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcLineWidth.java
ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcPolygonElement.java
ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcPolyline.java
ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcText.java
ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcTextAlignment.java
ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcTextColour.java
ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcTextFontIndex.java
ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/rsc/ImageBuilder.java
ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/rsc/NtransResource.java
ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/plotModels/NcPlotModelHdf5DataRequestor.java
ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/rsc/EditPlotModelComposite.java
ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/rsc/NcPlotResource2.java
ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/rsc/Tracer.java
ncep/gov.noaa.nws.ncep.viz.ui.remotescript/build.properties
Change-Id: I8559c4f5f35be8df6fdc4d1467c5f9ccff08ffb6
Former-commit-id: d98c1adc91 [formerly 2406f0786f] [formerly 561b751e58] [formerly d98c1adc91 [formerly 2406f0786f] [formerly 561b751e58] [formerly 662436c2d5 [formerly 561b751e58 [formerly 3775b0762b9d8529f5aa6630480d82e7ea62c1d8]]]]
Former-commit-id: 662436c2d5
Former-commit-id: c3e1eebd6d [formerly 3251e256c6] [formerly 4940723817b19e437897ef6ec6d862340b0a86f7 [formerly a631e61fe5]]
Former-commit-id: 3248a201641e504c0b9e17abd8322cce5f5a0486 [formerly bbabe5d087]
Former-commit-id: 2679b9ef8d
|
2014-09-11 11:14:33 -04:00 |
|
Stephen Gilbert
|
d98c1adc91
|
Merge branch 'ncep_14.2.1-n' into ncep_14.3.1
Conflicts:
cave/build/cave/customTargets.xml
edexOsgi/build.edex/opt/db/ddl/ncep/loadVors.sql
edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_NCEP-7.xml
edexOsgi/com.raytheon.uf.tools.cli/impl/src/pgen/ActivityUtil.py
ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/calculation/CalcEach1min.java
ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/calculation/CalcEach3hr.java
ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/calculation/CalcKp.java
ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/calculation/CalcUtil.java
ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/request/DatabaseUtil.java
ncep/gov.noaa.nws.ncep.edex.common/src/gov/noaa/nws/ncep/edex/common/sounding/NcSoundingLayer.java
ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/remoteScripts/baseScript-1
ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/remoteScripts/test_script
ncep/gov.noaa.nws.ncep.edex.plugin.aww/src/gov/noaa/nws/ncep/edex/plugin/aww/util/AwwParser.java
ncep/gov.noaa.nws.ncep.edex.plugin.geomag/res/spring/geomag-request.xml
ncep/gov.noaa.nws.ncep.edex.plugin.geomag/src/gov/noaa/nws/ncep/edex/plugin/geomag/TrigKCalculation.java
ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/res/spring/ncgrib-file-endpoint.xml
ncep/gov.noaa.nws.ncep.ui.nctextui/src/gov/noaa/nws/ncep/ui/nctextui/dbutil/NctextDbQuery.java
ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/NsharpConstants.java
ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/display/rsc/NsharpDataPaneResource.java
ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/display/rsc/NsharpResourceHandler.java
ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/display/rsc/NsharpSkewTPaneResource.java
ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/natives/NsharpNative.java
ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/natives/NsharpNativeConstants.java
ncep/gov.noaa.nws.ncep.ui.pgen/localization/ncep/pgen/xslt/prod/f000.xslt
ncep/gov.noaa.nws.ncep.ui.pgen/localization/ncep/pgen/xslt/prod/f000_hires.xslt
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/attrdialog/ContoursAttrDlg.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/contours/Contours.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/controls/RetrieveActivityDialog.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/controls/StoreActivityDialog.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/display/DisplayElementFactory.java
ncep/gov.noaa.nws.ncep.viz.common/src/gov/noaa/nws/ncep/viz/common/ui/HILORelativeMinAndMaxLocator.java
ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SURFACE/SHIP6HR/SHIP6HR.xml
ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/contours/ContourSupport.java
ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/rsc/NcgridResource.java
ncep/gov.noaa.nws.ncep.viz.rsc.ncscat/src/gov/noaa/nws/ncep/viz/rsc/ncscat/rsc/NcscatResource.java
ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcCGM.java
ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcCharacterHeight.java
ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcCircleElement.java
ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcCommand.java
ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcFillColour.java
ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcInteriorStyle.java
ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcLineColour.java
ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcLineWidth.java
ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcPolygonElement.java
ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcPolyline.java
ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcText.java
ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcTextAlignment.java
ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcTextColour.java
ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcTextFontIndex.java
ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/rsc/ImageBuilder.java
ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/rsc/NtransResource.java
ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/plotModels/NcPlotModelHdf5DataRequestor.java
ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/rsc/EditPlotModelComposite.java
ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/rsc/NcPlotResource2.java
ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/rsc/Tracer.java
ncep/gov.noaa.nws.ncep.viz.ui.remotescript/build.properties
Change-Id: I8559c4f5f35be8df6fdc4d1467c5f9ccff08ffb6
Former-commit-id: 662436c2d5 [formerly 561b751e58 [formerly 3775b0762b9d8529f5aa6630480d82e7ea62c1d8]]
Former-commit-id: 561b751e58
Former-commit-id: 2406f0786f
|
2014-09-11 11:14:33 -04:00 |
|
Nate Jensen
|
5bf7a632ad
|
Omaha #3356 updates for improved level lookup
Change-Id: I32ca44114fb18770bff22c6d0c9173e8fa49a362
Former-commit-id: 1e06c862bf [formerly 1c77f66608] [formerly ae9cffaaea] [formerly 1e06c862bf [formerly 1c77f66608] [formerly ae9cffaaea] [formerly 62b84b2fb3 [formerly ae9cffaaea [formerly 0ca90b58d7ca85d5bfc8fc525415115ac8451c5b]]]]
Former-commit-id: 62b84b2fb3
Former-commit-id: 925288784b [formerly d397d4147c] [formerly 87f7aeab8ea0381f4b60524400099467d56eef15 [formerly f5ae895143]]
Former-commit-id: 14cf3a3aaa85b3c7504b40d5dab981a05190edd4 [formerly eec3df9cd5]
Former-commit-id: 3cf27fb414
|
2014-09-09 15:38:53 -05:00 |
|
Nate Jensen
|
1e06c862bf
|
Omaha #3356 updates for improved level lookup
Change-Id: I32ca44114fb18770bff22c6d0c9173e8fa49a362
Former-commit-id: 62b84b2fb3 [formerly ae9cffaaea [formerly 0ca90b58d7ca85d5bfc8fc525415115ac8451c5b]]
Former-commit-id: ae9cffaaea
Former-commit-id: 1c77f66608
|
2014-09-09 15:38:53 -05:00 |
|
Brian.Dyke
|
74f3dd287f
|
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: d8271549ff [formerly fe85eb9f70] [formerly 3d9a3de6e4] [formerly d8271549ff [formerly fe85eb9f70] [formerly 3d9a3de6e4] [formerly 01dfe503f5 [formerly 3d9a3de6e4 [formerly a3365943e7b7972a5c86f8cb1ad39667ab9e0695]]]]
Former-commit-id: 01dfe503f5
Former-commit-id: 3319853886 [formerly 29364e2b9f] [formerly 3c59646613e08582e0a259ecdec538060ca047c5 [formerly c42733eb39]]
Former-commit-id: 582e8cd843a57e8f4ac7a6572a5b3e23cd3b4f25 [formerly a31d3d702e]
Former-commit-id: 0f9fe8301a
|
2014-09-09 11:44:30 -04:00 |
|
Brian.Dyke
|
d8271549ff
|
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: 01dfe503f5 [formerly 3d9a3de6e4 [formerly a3365943e7b7972a5c86f8cb1ad39667ab9e0695]]
Former-commit-id: 3d9a3de6e4
Former-commit-id: fe85eb9f70
|
2014-09-09 11:44:30 -04:00 |
|
Brian.Dyke
|
0c715b7439
|
Merge branch 'field_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Conflicts:
cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
Former-commit-id: a344be95c8 [formerly 5415a4939a] [formerly 858b91d677] [formerly a344be95c8 [formerly 5415a4939a] [formerly 858b91d677] [formerly af477df90e [formerly 858b91d677 [formerly 7b49ea6d9c45c0624017bbe7ffb1297a402ee875]]]]
Former-commit-id: af477df90e
Former-commit-id: 4582533601 [formerly dde3efc567] [formerly f892d9608dc1fb65163dac3714b16398a7d89022 [formerly 6c4b121752]]
Former-commit-id: 2c8a415a8d01954bd8f0e11fa551974a70c7759e [formerly 66c4758f2d]
Former-commit-id: b42aba7839
|
2014-09-08 14:54:16 -04:00 |
|
Brian.Dyke
|
a344be95c8
|
Merge branch 'field_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Conflicts:
cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
Former-commit-id: af477df90e [formerly 858b91d677 [formerly 7b49ea6d9c45c0624017bbe7ffb1297a402ee875]]
Former-commit-id: 858b91d677
Former-commit-id: 5415a4939a
|
2014-09-08 14:54:16 -04:00 |
|
Brian.Dyke
|
aac4db559a
|
Merge branch 'field_14.2.4' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.2.4
Former-commit-id: 9f7fabb002 [formerly d7407481ef [formerly c1f870d9df7579741e5a1d79cdec77293115e968]]
Former-commit-id: d7407481ef
Former-commit-id: cdd1e08ee3
|
2014-09-05 10:57:14 -04:00 |
|
Brian.Dyke
|
e4bf146b21
|
Merge branch 'field_14.2.4' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.2.4
Former-commit-id: aac4db559a [formerly cdd1e08ee3] [formerly d7407481ef] [formerly aac4db559a [formerly cdd1e08ee3] [formerly d7407481ef] [formerly 9f7fabb002 [formerly d7407481ef [formerly c1f870d9df7579741e5a1d79cdec77293115e968]]]]
Former-commit-id: 9f7fabb002
Former-commit-id: 47d1e3fc72 [formerly 8a3f7aa5d9] [formerly 837e597fdc8b199428dda951988ca6f8034cc15e [formerly 6f4bdae843]]
Former-commit-id: 4d9d4a799a8132e78ff387f5d9ac30b936a01948 [formerly 86e748a02e]
Former-commit-id: ea20efaf55
|
2014-09-05 10:57:14 -04:00 |
|
Ana Rivera
|
5a534e377c
|
VLab Issue #4601 - Update to SMS DR #16720; Remove HRRR entries in master_grib2_lookup.txt; fixes #4601
Change-Id: I0dfe0991503e6d87ce2db9713bb016d68cd1c152
Former-commit-id: a8b04b8e63 [formerly 6d48576930 [formerly 084970f8445dbb6b76bbad84b5dc986d961d2383]]
Former-commit-id: 6d48576930
Former-commit-id: c77e5412a6
|
2014-09-05 13:27:29 +00:00 |
|
Ana Rivera
|
a0969efb51
|
VLab Issue #4601 - Update to SMS DR #16720; Remove HRRR entries in master_grib2_lookup.txt; fixes #4601
Change-Id: I0dfe0991503e6d87ce2db9713bb016d68cd1c152
Former-commit-id: 5a534e377c [formerly c77e5412a6] [formerly 6d48576930] [formerly 5a534e377c [formerly c77e5412a6] [formerly 6d48576930] [formerly a8b04b8e63 [formerly 6d48576930 [formerly 084970f8445dbb6b76bbad84b5dc986d961d2383]]]]
Former-commit-id: a8b04b8e63
Former-commit-id: 3018955360 [formerly f5695a423d] [formerly 5fa5b948bc157a0af41e64acb9d93c5ee63df7fd [formerly ac4f61813f]]
Former-commit-id: 941d2e1472a9faf92a73224d0a040bed3871fa83 [formerly 3e1039b714]
Former-commit-id: 9d16e16770
|
2014-09-05 13:27:29 +00:00 |
|
Stephen Gilbert
|
464caf9a46
|
VLab Issue #4001 - NCEP EDEX and EDEX Common delivery for 14.2.1-n
AWW and Upper Air updates. Revert some RTS xml files
Change-Id: I4cc48defcea33b9008c9734c1c53a193d0ce94da
Former-commit-id: a048c75e8f [formerly 4abe38b3ac] [formerly 32dffe58c8] [formerly a048c75e8f [formerly 4abe38b3ac] [formerly 32dffe58c8] [formerly 75277cb034 [formerly 32dffe58c8 [formerly 72fa8af848f1452a517a62c6a54eae265a9ec8a1]]]]
Former-commit-id: 75277cb034
Former-commit-id: 81b5577db2 [formerly 3353687520] [formerly 80edab3aa065417f6b89e9109ca2655cbc6f6e62 [formerly 3da185fa1a]]
Former-commit-id: e9081f52f42a889b0433a31e3e862161b704904a [formerly a0f6386a90]
Former-commit-id: 2493e6492c
|
2014-09-03 14:33:37 -04:00 |
|
Stephen Gilbert
|
a048c75e8f
|
VLab Issue #4001 - NCEP EDEX and EDEX Common delivery for 14.2.1-n
AWW and Upper Air updates. Revert some RTS xml files
Change-Id: I4cc48defcea33b9008c9734c1c53a193d0ce94da
Former-commit-id: 75277cb034 [formerly 32dffe58c8 [formerly 72fa8af848f1452a517a62c6a54eae265a9ec8a1]]
Former-commit-id: 32dffe58c8
Former-commit-id: 4abe38b3ac
|
2014-09-03 14:33:37 -04:00 |
|
Brian.Dyke
|
9105ef9aa2
|
Merge branch 'field_14.2.4' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.2.4
Former-commit-id: 611e036e75 [formerly f0875e724f [formerly 40efe51cafd5589ef0a640041ad0539e454b6f8d]]
Former-commit-id: f0875e724f
Former-commit-id: e425e5bf8c
|
2014-09-02 16:30:51 -04:00 |
|
Brian.Dyke
|
3539b14e3b
|
Merge branch 'field_14.2.4' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.2.4
Former-commit-id: 9105ef9aa2 [formerly e425e5bf8c] [formerly f0875e724f] [formerly 9105ef9aa2 [formerly e425e5bf8c] [formerly f0875e724f] [formerly 611e036e75 [formerly f0875e724f [formerly 40efe51cafd5589ef0a640041ad0539e454b6f8d]]]]
Former-commit-id: 611e036e75
Former-commit-id: 0015f2440e [formerly 3b9653ef00] [formerly c73653650f9ff8397fc5371a4686056fcc738000 [formerly caf5f778e9]]
Former-commit-id: 8382ee6ae605cca7bbd88f333d4d1875fc119a63 [formerly 4425e3db61]
Former-commit-id: 0d6ef0345d
|
2014-09-02 16:30:51 -04:00 |
|
Steve Harris
|
3c8bfc8160
|
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: 3619a11a8a [formerly bddf9c0f27] [formerly 793064063b] [formerly 3619a11a8a [formerly bddf9c0f27] [formerly 793064063b] [formerly 5d58625abc [formerly 793064063b [formerly 8793dca41f756ba812206b48391caea6e593a657]]]]
Former-commit-id: 5d58625abc
Former-commit-id: 10070d2762 [formerly 66b485c000] [formerly db0dcd3c8aec6653a2b81e49b72319049b73eb54 [formerly d984dd538f]]
Former-commit-id: ecf6e2073b4dd08f6ed165eae9b0647f2d0b9dc4 [formerly e681e0a457]
Former-commit-id: ecf26b3ac5
|
2014-08-29 10:17:52 -05:00 |
|
Steve Harris
|
3619a11a8a
|
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: 5d58625abc [formerly 793064063b [formerly 8793dca41f756ba812206b48391caea6e593a657]]
Former-commit-id: 793064063b
Former-commit-id: bddf9c0f27
|
2014-08-29 10:17:52 -05:00 |
|
Brian.Dyke
|
42e17418ed
|
Merge branch 'master_14.3.1' into asm_14.3.1
Former-commit-id: 8f69c4b855 [formerly cbe59aded5] [formerly 6f3d0508e4] [formerly 8f69c4b855 [formerly cbe59aded5] [formerly 6f3d0508e4] [formerly 2c25f68437 [formerly 6f3d0508e4 [formerly f34bc4f81eb5ac92ef306f73f8c34243d3f78e31]]]]
Former-commit-id: 2c25f68437
Former-commit-id: 4afabdfb18 [formerly 07ffb04445] [formerly a36a933e1051f5ac6e37163907155d158df993b0 [formerly 2abed9c0eb]]
Former-commit-id: 1bf17b8d14f9883ca968441daded2fdc1e43f653 [formerly 8d7b13548f]
Former-commit-id: b01c60ca50
|
2014-08-29 10:19:02 -04:00 |
|
Brian.Dyke
|
8f69c4b855
|
Merge branch 'master_14.3.1' into asm_14.3.1
Former-commit-id: 2c25f68437 [formerly 6f3d0508e4 [formerly f34bc4f81eb5ac92ef306f73f8c34243d3f78e31]]
Former-commit-id: 6f3d0508e4
Former-commit-id: cbe59aded5
|
2014-08-29 10:19:02 -04:00 |
|
Baoyu Yin
|
ae0758a970
|
VLab Issue #4563 - AWIPS2_DR_17371 Changes made in MPE editor not available in D-2D; fixes #4563
Change-Id: I5f5c55486f209b89ecf276bb38d3d42c7f60d1d1
Former-commit-id: 52f4873f3f [formerly cbc7d2813f] [formerly bf5bb1bacf] [formerly 52f4873f3f [formerly cbc7d2813f] [formerly bf5bb1bacf] [formerly bfc550b378 [formerly bf5bb1bacf [formerly 5189ae1c3ce12320045c431d9552036ea9272cef]]]]
Former-commit-id: bfc550b378
Former-commit-id: e958f07231 [formerly 939e96be9b] [formerly f4c91099150a6f46e0e0d614c71cad13730a5c5b [formerly 70b265dae2]]
Former-commit-id: 5e9b5a301ec469e221a816ddafad19cebe16f4f7 [formerly 88e01c26db]
Former-commit-id: 4e755d38e6
|
2014-08-29 10:17:54 -04:00 |
|
Baoyu Yin
|
52f4873f3f
|
VLab Issue #4563 - AWIPS2_DR_17371 Changes made in MPE editor not available in D-2D; fixes #4563
Change-Id: I5f5c55486f209b89ecf276bb38d3d42c7f60d1d1
Former-commit-id: bfc550b378 [formerly bf5bb1bacf [formerly 5189ae1c3ce12320045c431d9552036ea9272cef]]
Former-commit-id: bf5bb1bacf
Former-commit-id: cbc7d2813f
|
2014-08-29 10:17:54 -04:00 |
|
Ana Rivera
|
b03dd41331
|
VLab Issue #3617 - RMDR_16720 Updates to HRRR DCS_266; fixes #3617
Change-Id: I159cbaed918fc48c31d115314e29ad9c2128a7f1
Former-commit-id: 9af77831a6 [formerly 160dabc4d1 [formerly 2df117a7aec644e6964da6c36326ab3b29b9f378]]
Former-commit-id: 160dabc4d1
Former-commit-id: e033ed5546
|
2014-08-28 18:38:26 +00:00 |
|
Ana Rivera
|
e57246c6ce
|
VLab Issue #3617 - RMDR_16720 Updates to HRRR DCS_266; fixes #3617
Change-Id: I159cbaed918fc48c31d115314e29ad9c2128a7f1
Former-commit-id: b03dd41331 [formerly e033ed5546] [formerly 160dabc4d1] [formerly b03dd41331 [formerly e033ed5546] [formerly 160dabc4d1] [formerly 9af77831a6 [formerly 160dabc4d1 [formerly 2df117a7aec644e6964da6c36326ab3b29b9f378]]]]
Former-commit-id: 9af77831a6
Former-commit-id: ae4ea166aa [formerly 2045699212] [formerly 55222fba76e6458ccc65b959b86f2e7bff061cbc [formerly fbe4d57f6b]]
Former-commit-id: f1c71d002deedd0c02aa5622f474ac29e9b2dd09 [formerly dee335f370]
Former-commit-id: aec8eba1a7
|
2014-08-28 18:38:26 +00:00 |
|
Brian.Dyke
|
2da6c7b93b
|
Merge branch 'master_14.2.4' into master_14.3.1 CM-MERGE:14.2.4-5 into 14.3.1
Conflicts:
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.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java
Former-commit-id: 0a5ddf7457 [formerly a08db8d73d] [formerly e654318431] [formerly 0a5ddf7457 [formerly a08db8d73d] [formerly e654318431] [formerly aa83bf804f [formerly e654318431 [formerly 7334d3991903dfe8a62728de33c21e81534fdbb6]]]]
Former-commit-id: aa83bf804f
Former-commit-id: 4a56b6f6e1 [formerly f90649d7e7] [formerly c580412a81e899b2803a785d3de77c4ea7ca97b3 [formerly f7f16ff9eb]]
Former-commit-id: 2b5f667a78842762d60c8ab0ba442f22b9229095 [formerly c0dc594eda]
Former-commit-id: 7e4ab705cc
|
2014-08-27 11:19:19 -04:00 |
|
Brian.Dyke
|
0a5ddf7457
|
Merge branch 'master_14.2.4' into master_14.3.1 CM-MERGE:14.2.4-5 into 14.3.1
Conflicts:
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.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java
Former-commit-id: aa83bf804f [formerly e654318431 [formerly 7334d3991903dfe8a62728de33c21e81534fdbb6]]
Former-commit-id: e654318431
Former-commit-id: a08db8d73d
|
2014-08-27 11:19:19 -04:00 |
|
Steve Harris
|
146dc3aec7
|
Merge branch 'master_14.3.1' (14.3.1-15) into omaha_14.4.1
Conflicts:
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLDisposalManager.java
cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/actions/LoadSerializedXml.java
cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/perspectives/VizPerspectiveListener.java
cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
edexOsgi/com.raytheon.uf.common.status/src/com/raytheon/uf/common/status/logback/ThreadBasedAppender.java
Former-commit-id: 33b4901c09 [formerly 8c5026314c] [formerly 99ae9bdc10] [formerly 33b4901c09 [formerly 8c5026314c] [formerly 99ae9bdc10] [formerly 038b284066 [formerly 99ae9bdc10 [formerly 03ba5101d6f277b55173f72c2a63869e9dc31c3f]]]]
Former-commit-id: 038b284066
Former-commit-id: 00b3ad8eb6 [formerly 1da31a86dc] [formerly c9abc2fce0e20d37683d43d809074ccd92db5423 [formerly c8ba2b1ae6]]
Former-commit-id: c07303fea0c9c3e107dabbeefbd395be90d9018f [formerly 84edac842e]
Former-commit-id: 9d263bc542
|
2014-08-26 16:25:21 -05:00 |
|
Steve Harris
|
33b4901c09
|
Merge branch 'master_14.3.1' (14.3.1-15) into omaha_14.4.1
Conflicts:
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLDisposalManager.java
cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/actions/LoadSerializedXml.java
cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/perspectives/VizPerspectiveListener.java
cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
edexOsgi/com.raytheon.uf.common.status/src/com/raytheon/uf/common/status/logback/ThreadBasedAppender.java
Former-commit-id: 038b284066 [formerly 99ae9bdc10 [formerly 03ba5101d6f277b55173f72c2a63869e9dc31c3f]]
Former-commit-id: 99ae9bdc10
Former-commit-id: 8c5026314c
|
2014-08-26 16:25:21 -05:00 |
|
Brian.Dyke
|
8f7c518c0d
|
Merge branch 'master_14.3.1' into asm_14.3.1
Former-commit-id: aa2b4835e3 [formerly 3459e1fcbc] [formerly d168e371aa] [formerly aa2b4835e3 [formerly 3459e1fcbc] [formerly d168e371aa] [formerly 175f4e67c1 [formerly d168e371aa [formerly a6d5822b5cb5bb3aa62fcc95e980b08c685a3be3]]]]
Former-commit-id: 175f4e67c1
Former-commit-id: e1e5e82038 [formerly b3b2a8f365] [formerly 8fd80abba55af1ef07035306474c97175aadc433 [formerly 25282d10ac]]
Former-commit-id: c614c8d052db2c431862195fd45edf538069003d [formerly caee2cd9a0]
Former-commit-id: a85b872d1f
|
2014-08-26 15:00:55 -04:00 |
|
Brian.Dyke
|
aa2b4835e3
|
Merge branch 'master_14.3.1' into asm_14.3.1
Former-commit-id: 175f4e67c1 [formerly d168e371aa [formerly a6d5822b5cb5bb3aa62fcc95e980b08c685a3be3]]
Former-commit-id: d168e371aa
Former-commit-id: 3459e1fcbc
|
2014-08-26 15:00:55 -04:00 |
|
Brian.Dyke
|
272905b186
|
Merge branch 'master_14.2.2' into master_14.2.4 CM-MERGE:14.2.2-25-29 into 14.2.4
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py
Former-commit-id: 6402cb7d89 [formerly 2ddc920a4a] [formerly 325887e605] [formerly 6402cb7d89 [formerly 2ddc920a4a] [formerly 325887e605] [formerly dd9d7133d9 [formerly 325887e605 [formerly 65e2373d13c7d5b33d579b87d98a8265252ea391]]]]
Former-commit-id: dd9d7133d9
Former-commit-id: e348a6abc7 [formerly c8e9153884] [formerly 7dbc20e2697aab4991870bf8493b74b08acbe56b [formerly 1839b614df]]
Former-commit-id: 85ccff40908964b07fef1c572de049c609434728 [formerly cd1b914f50]
Former-commit-id: 27372f098c
|
2014-08-22 14:16:22 -04:00 |
|
Brian.Dyke
|
6402cb7d89
|
Merge branch 'master_14.2.2' into master_14.2.4 CM-MERGE:14.2.2-25-29 into 14.2.4
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py
Former-commit-id: dd9d7133d9 [formerly 325887e605 [formerly 65e2373d13c7d5b33d579b87d98a8265252ea391]]
Former-commit-id: 325887e605
Former-commit-id: 2ddc920a4a
|
2014-08-22 14:16:22 -04:00 |
|
Brian.Dyke
|
348b4c12e9
|
Merge branch 'omaha_14.2.4' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.2.4
Former-commit-id: 64effd458c [formerly 5b2b0d2bd9] [formerly a830b6d94c] [formerly 64effd458c [formerly 5b2b0d2bd9] [formerly a830b6d94c] [formerly 94577a1626 [formerly a830b6d94c [formerly b2674ef57183706feb2bb17175d730bb2e213281]]]]
Former-commit-id: 94577a1626
Former-commit-id: 9c119c8431 [formerly 0cbbceb7e3] [formerly 5ebef4a85e30ac73432bcaf6ac7df852b8d06f7e [formerly a0af10ff2e]]
Former-commit-id: 522edbdb9ffeff69b90b3db092cedb88b93eea4b [formerly d0a2060e84]
Former-commit-id: 5a878760f1
|
2014-08-22 14:13:48 -04:00 |
|
Brian.Dyke
|
64effd458c
|
Merge branch 'omaha_14.2.4' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.2.4
Former-commit-id: 94577a1626 [formerly a830b6d94c [formerly b2674ef57183706feb2bb17175d730bb2e213281]]
Former-commit-id: a830b6d94c
Former-commit-id: 5b2b0d2bd9
|
2014-08-22 14:13:48 -04:00 |
|
Brian.Dyke
|
00b3705149
|
VLab Issue #3648 - Corrected NCEP additions for ESTOFS model -fix gribModels_NCEP-7.xml tag
Former-commit-id: e9cd8aba20 [formerly 93be1a54c7] [formerly 7b8fef0fa3] [formerly e9cd8aba20 [formerly 93be1a54c7] [formerly 7b8fef0fa3] [formerly ae5656ca46 [formerly 7b8fef0fa3 [formerly 1b83b788aee082b489ce0fe5dc6d775e2f621e01]]]]
Former-commit-id: ae5656ca46
Former-commit-id: 1382e07119 [formerly 17b9ae1418] [formerly b70337fe76136addade0078d2a3e33f5ca57b9cf [formerly bcf53f53da]]
Former-commit-id: ece4562da20dabf5134e7571432e44bc329487c2 [formerly d5bcfff431]
Former-commit-id: aa4fad07e8
|
2014-08-21 11:07:02 -04:00 |
|
Brian.Dyke
|
e9cd8aba20
|
VLab Issue #3648 - Corrected NCEP additions for ESTOFS model -fix gribModels_NCEP-7.xml tag
Former-commit-id: ae5656ca46 [formerly 7b8fef0fa3 [formerly 1b83b788aee082b489ce0fe5dc6d775e2f621e01]]
Former-commit-id: 7b8fef0fa3
Former-commit-id: 93be1a54c7
|
2014-08-21 11:07:02 -04:00 |
|