Fay.Liang
|
37f830c123
|
Merge branch 'gsd_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1
Former-commit-id: ae85ade54d [formerly ae85ade54d [formerly 06a34c609a217ca98b027ac6d92a31faf802b668]]
Former-commit-id: f1c34884a5
Former-commit-id: 82b3637598
|
2015-02-03 11:24:57 -05:00 |
|
Ana Rivera
|
0715e923df
|
Merge branch 'master_14.4.1' into gsd_14.4.1
Change-Id: I5b7c7e17031ec4d081c03e3c4378faf6122849d5
Former-commit-id: ea92049aac [formerly ea92049aac [formerly d5996a81aad0809aaddbb8df99a985c86c66aaf8]]
Former-commit-id: 070f0136ec
Former-commit-id: 1bbb9bad78
|
2015-01-30 19:29:29 +00:00 |
|
Ana Rivera
|
0af5d55eb6
|
Merge branch 'master_14.4.1' into field_14.4.1
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
Change-Id: I1f3f22ff1e9dfa32f971136479bb312230c1fc40
Former-commit-id: 8bfa7c4087 [formerly 8bfa7c4087 [formerly 291d66c66af4f1f4d298185412d5930714ffb2c5]]
Former-commit-id: 20ad0a65f3
Former-commit-id: 3696a3a1d1
|
2015-01-27 22:05:59 +00:00 |
|
Ana Rivera
|
cd2841195b
|
Merge branch 'master_14.4.1' into emc_14.4.1
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/grid/dataset/alias/gfeParamInfo.xml
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
Change-Id: I3a9565d5861f431bd8ac74f8e20e5e79bbbdbad1
Former-commit-id: 98ac97e397 [formerly 98ac97e397 [formerly 51ef304bd94fd003a1e7349a22c41e21b340ac8a]]
Former-commit-id: 7c25945fd9
Former-commit-id: eae1bd317d
|
2015-01-26 18:45:26 +00:00 |
|
Joshua Watson
|
eb68dac32d
|
VLab Issue #5238 DR_14024 Code changes for gridded LAMP modifications; fixes #5238
Change-Id: I9e13afd8f7736f71fe8d584b1ff9a5b1ec943667
Former-commit-id: 3f2f7f2f3a [formerly 3f2f7f2f3a [formerly 5f730d514fd3e4b6780d7a3d60dcb08b102ecd29]]
Former-commit-id: 5aa4748569
Former-commit-id: 094e8048e9
|
2014-12-17 08:38:27 -05:00 |
|
Ana Rivera
|
f7c0319ee4
|
Merge branch 'omaha_14.4.1' into field_14.4.1. Conflicts resolved: VLab Issue #4129, #5421, #5345.
Conflicts:
cave/com.raytheon.uf.viz.image.export/src/com/raytheon/uf/viz/image/export/dialog/ImageExportDialog.java
cave/com.raytheon.uf.viz.image.export/src/com/raytheon/uf/viz/image/export/options/ImageExportOptions.java
cave/com.raytheon.viz.feature.awips.developer/feature.xml
edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/grid/dataset/alias/gfeParamInfo.xml
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
Change-Id: Ic838b8b0499b1022a555915c7264b414d6948895
Former-commit-id: 043bc3a8b7 [formerly 043bc3a8b7 [formerly 111ae763e6becb944e34e262e1d87d2d344236e4]]
Former-commit-id: 1823ed3596
Former-commit-id: d2d8127363
|
2014-12-16 23:39:02 +00:00 |
|
Ana Rivera
|
c406ea45b9
|
VLab Issue #4365 Decode Ensemble Kernel Density MOS (EKDMOS); fixes 4365
Change-Id: I1272721f43ee78b310fcf74227317cf27e8d6b28
Former-commit-id: 2eec9d9557 [formerly 2eec9d9557 [formerly cb236c208fe6489f88144adab3178dccd4a826db]]
Former-commit-id: dcf5dc2173
Former-commit-id: 09a9b3491c
|
2014-12-16 16:39:22 +00:00 |
|
Joshua Watson
|
33e4b8bc88
|
VLab Issue #4129 - DR_17246 Code changes for gridded MOS modifications; fixes #4129
Change-Id: I4fc4436af321baf3b6057229b982f0aba35f5840
Former-commit-id: a8f5bb480b [formerly a8f5bb480b [formerly cfce2a5f633a7312b9ad64dafb559c834b0ceddf]]
Former-commit-id: bca4b40eed
Former-commit-id: 9383635749
|
2014-12-11 11:39:00 -05:00 |
|
Roger Ferrel
|
526855c99a
|
Omaha #3658 Scale arrows and use consistent units.
Change-Id: I7a627b015d2806e8456dd77e0eae679bbd370899
Former-commit-id: 5d91f976af [formerly 5d91f976af [formerly 0f0eafd8687edc0c10ef21495175f1e68f926577]]
Former-commit-id: 64b8d193f4
Former-commit-id: 335f9b862e
|
2014-12-05 11:54:27 -06:00 |
|
Roger Ferrel
|
ab0c6581b2
|
Omaha #3866 Added GFS20 to gfe. Latest changes to Pacific region.
Change-Id: I2c12259947289efaa5ce03be7adce42cdca0a28a
Former-commit-id: 462e0d85c0 [formerly 462e0d85c0 [formerly 46d3bbcc99d93845dcb159012b872fe746756b7c]]
Former-commit-id: 597fdb8280
Former-commit-id: c9f619028d
|
2014-12-04 12:52:22 -06:00 |
|
Ana Rivera
|
ccbb684974
|
VLab Issue #5194 - Ingest and Display NWPS data; fixes #5194
Change-Id: Ib617760363c10e72ee54fd9ca30656fd0b7bd02f
Former-commit-id: 709d571947 [formerly 709d571947 [formerly 6866439b0a7075f04146af4b4bdce59477269f4d]]
Former-commit-id: fe5bfbaa73
Former-commit-id: 8eaeb7b322
|
2014-12-02 15:44:07 +00:00 |
|
Ana Rivera
|
899a9d762d
|
VLab Issue #5472 - Revert VLab Issue #5034 (first NWPS code merge); fixes #5472
This reverts commit 227ca65a041b4cf1c6930926ce67b7f4394e1097 [formerly f1f5f2c717] [formerly c245f3a3c4 [formerly c245f3a3c4 [formerly a72135fc85a602b67b929b6870edbaabf4dc8fc1]]].
Change-Id: I631bb1722abea96e08967a8d9fa9f175a886f685
Former-commit-id: 0e8473e91e [formerly 0e8473e91e [formerly 373acfce57d5e0044f13382b926cb2fc1f830e54]]
Former-commit-id: 5abf37ea62
Former-commit-id: 7c3dd12351
|
2014-12-02 13:43:03 +00:00 |
|
Richard Peter
|
30f04ed077
|
Merge "Omaha #3870 Updated table to include missing elements." into omaha_14.4.1
Former-commit-id: 6d046826dc [formerly 6d046826dc [formerly e7056504ae5758e2b4abbdef9cec7b2467d49add]]
Former-commit-id: 6759ffa76c
Former-commit-id: 25407d6fdd
|
2014-11-26 10:13:40 -06:00 |
|
Roger Ferrel
|
be828d05e5
|
Omaha #3870 Updated table to include missing elements.
Former-commit-id: c4cf624d04 [formerly c4cf624d04 [formerly 7569e4f2b962d22453b7414ea882f2383cec9ade]]
Former-commit-id: fedc4aae8a
Former-commit-id: e3d4250f65
|
2014-11-25 14:31:05 -06:00 |
|
Roger Ferrel
|
975ee3aba9
|
Omaha #3866 Configuration files for GFS20KM for product and volume browsers.
Former-commit-id: 9b986c7cf8 [formerly 9b986c7cf8 [formerly 56833ab1b84e50c6ca4150d3c90501448233313b]]
Former-commit-id: 0df840602e
Former-commit-id: 4ba718da37
|
2014-11-25 10:01:30 -06:00 |
|
Evan Polster
|
bd30bb5b20
|
Merge "VLab Issue #5069 Files for DR 14006." into gsd_14.4.1
Former-commit-id: 78a4d3425b [formerly 78a4d3425b [formerly f0d0953f6fe1bc6d2ace9dce159a6354a2c55264]]
Former-commit-id: b7b2087e1f
Former-commit-id: 2e135d26b5
|
2014-11-21 13:30:59 -05:00 |
|
Ana Rivera
|
e5f6dae5bd
|
Merge branch 'master_14.4.1' into emc_14.4.1
Change-Id: I4984b06810f3484e919a4a4a5853435ca34167bb
Former-commit-id: 1645ccd9ca [formerly 1645ccd9ca [formerly c69e94f227cb908a9af2e1cd2db35b25bef28701]]
Former-commit-id: 1999049d90
Former-commit-id: 95b016ef4e
|
2014-11-21 14:23:49 +00:00 |
|
Steve Harris
|
2695a061f4
|
Merge tag 'OB_14.3.1-32m' into omaha_14.4.1
Conflicts:
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/ParmManager.java
cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
edexOsgi/build.edex/esb/conf/logback-ingest.xml
edexOsgi/com.raytheon.uf.edex.core/src/com/raytheon/uf/edex/core/IMessageProducer.java
edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/MessageProducer.java
Former-commit-id: a16abe1b8b [formerly a16abe1b8b [formerly 565efec2ebe5a3a1a009d213a77617f4a593aa6b]]
Former-commit-id: 9de825c332
Former-commit-id: 5e6aa15038
|
2014-11-10 08:42:01 -06:00 |
|
Brian.Dyke
|
54f82d7f6f
|
Merge branch 'master_14.2.4' into master_14.3.1
Conflicts:
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/ParmManager.java
cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-common.xml
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/GFESiteActivation.java
edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/MessageProducer.java
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
Former-commit-id: aae68215c8 [formerly aae68215c8 [formerly 5c2079dd25181c68f872691e81842aff0f696f8d]]
Former-commit-id: acf00264f4
Former-commit-id: 2b470ad1a1
|
2014-11-06 12:55:21 -05:00 |
|
Jim Ramer
|
a4e1d4e9e4
|
VLab Issue #5069
Files for DR 14006.
Former-commit-id: e35ac6eeca [formerly e35ac6eeca [formerly c41dcab19a03ea315d6d77128208f65d839c6aec]]
Former-commit-id: e9b971471a
Former-commit-id: 2e62763046
|
2014-10-23 15:30:37 -06:00 |
|
Ana Rivera
|
ab680bc174
|
VLab Issue #5034 - Ingest and Display NWPS model data; fixes #5034
Change-Id: I836ffda083281073f5cf1d20de79f73091d49426
Former-commit-id: c245f3a3c4 [formerly c245f3a3c4 [formerly a72135fc85a602b67b929b6870edbaabf4dc8fc1]]
Former-commit-id: f1f5f2c717
Former-commit-id: c76ed237ac
|
2014-10-22 17:03:07 +00:00 |
|
Steve Harris
|
040e641ec9
|
Merge tag 'OB_14.3.1-27m' into omaha_14.4.1
Conflicts:
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/GH.xml
Former-commit-id: dc557b2d0c [formerly dc557b2d0c [formerly ea787b645974850607658e5a7dfc4a072d831a3b]]
Former-commit-id: bfade7674d
Former-commit-id: 9e7ce04543
|
2014-10-22 11:45:39 -05:00 |
|
Brian.Dyke
|
bcc0a9529f
|
Merge branch 'mdl_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: c60124fa61 [formerly c60124fa61 [formerly ea0a81b12c7b1a0154361d97882ef65fc55b20e1]]
Former-commit-id: 0d5f2c0add
Former-commit-id: e44ba36b9b
|
2014-10-16 11:21:39 -04:00 |
|
Nate Jensen
|
97b2b4c5b5
|
Omaha #3730 export postprocessors package
Change-Id: Ie87558540777c1cea7354b040e386ba67f835311
Former-commit-id: 5dd168e76a [formerly 5dd168e76a [formerly db613b63005c2763ca94851182042867aedd43c9]]
Former-commit-id: d5a5d55265
Former-commit-id: 1f970283b5
|
2014-10-15 14:46:12 -05:00 |
|
Steve Harris
|
cfd49c8ca0
|
Merge tag 'OB_14.3.1-24m' into omaha_14.4.1
Former-commit-id: 39c5e9c314 [formerly 39c5e9c314 [formerly df9ef1f664e14fa7843328338c5b234022f4bfd4]]
Former-commit-id: 2db03d95b3
Former-commit-id: 3542caf090
|
2014-10-06 13:57:59 -05:00 |
|
Darrel Kingfield
|
4353067ae9
|
VLab Issue #4922 - Rotation Tracks patch check-in
Former-commit-id: 8113b2ba69 [formerly 8113b2ba69 [formerly 48565726c39ea8139d4a3dfd505732cee2d32b16]]
Former-commit-id: aa168071aa
Former-commit-id: 4c6e014d54
|
2014-10-06 10:01:36 -05:00 |
|
Brian.Dyke
|
1d2dfd264a
|
Merge branch 'mdl_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: 65ad6056b6 [formerly 65ad6056b6 [formerly 8fa6749e28cb247ae63307f1423351c23ec0eb87]]
Former-commit-id: f3f95aabb0
Former-commit-id: e77f1e126e
|
2014-10-02 10:38:51 -04:00 |
|
Slav Korolev
|
f05360e224
|
Issue #3659 - Enabled to display HFR-EAST_6KM or HFR-WEST_6KM data as a Time Series
Former-commit-id: f7bcb81010 [formerly f7bcb81010 [formerly 2a03c64bb098a141c82aac4bab42d7d9f4a6296f]]
Former-commit-id: ad4bae10c9
Former-commit-id: 8fddad1cd1
|
2014-10-01 16:45:33 -04:00 |
|
Steve Harris
|
30f0d27dfb
|
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: 90e08b96e1 [formerly 90e08b96e1 [formerly c8b5d89c2e202e8bb4ad59d9ced8882ec8c2a6c1]]
Former-commit-id: 3b6a8a1447
Former-commit-id: 6330a62e85
|
2014-09-29 12:58:56 -05:00 |
|
Ben Steffensmeier
|
fc49d0bd55
|
Omaha #3132 - merge master_14.3.1 into omaha_14.4.1
Former-commit-id: f92d021e96 [formerly f92d021e96 [formerly 00d314b6b493bc34ccd77f731307b5039e22d844]]
Former-commit-id: 5b10ac2f36
Former-commit-id: 107ccbf332
|
2014-09-29 10:49:14 -05:00 |
|
Steve Harris
|
f831536854
|
Merge tag 'OB_14.3.1-19m' into omaha_14.4.1
Conflicts:
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/ext/imaging/GLColormappedImageExtension.java
cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/rsc/SatResource.java
cave/com.raytheon.viz.volumebrowser/localization/menus/xml/planesMenusPlanView.xml
edexOsgi/com.raytheon.edex.plugin.satellite/src/com/raytheon/edex/util/satellite/SatSpatialFactory.java
edexOsgi/com.raytheon.uf.common.colormap/src/com/raytheon/uf/common/colormap/prefs/DataMappingPreferences.java
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/mmp.xml
nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so
nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so
ohd/gov.noaa.nws.ohd.edex.plugin.hydrodualpol/src/gov/noaa/nws/ohd/edex/plugin/hydrodualpol/DSAProductProcessor.java
Former-commit-id: 7692e3f21d [formerly 7692e3f21d [formerly 72f387d2802c12eedfe5643616fe5a54420aef66]]
Former-commit-id: b979960b7b
Former-commit-id: 50d6dccd09
|
2014-09-23 11:41:10 -05:00 |
|
Brian.Dyke
|
c4d7c97897
|
Merge branch 'asm_14.3.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.3.1
Former-commit-id: 4db67c581c [formerly 4db67c581c [formerly 8d5d8cdfd272f8000a6a21a4128998889eb2ab30]]
Former-commit-id: 8d665b93b5
Former-commit-id: b83e12da28
|
2014-09-19 16:56:50 -04:00 |
|
Brian.Dyke
|
2a456a1b9b
|
Merge branch 'ncep_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: 6ad8d500ef [formerly 6ad8d500ef [formerly e895f7927a95c2416c05953e131d9e0c6095beb3]]
Former-commit-id: 9c33ae6d2c
Former-commit-id: 3b48d6368d
|
2014-09-19 14:42:29 -04:00 |
|
Darrel Kingfield
|
142edfe588
|
VLab Issue #4603 - MRMS SBN Display initial code check-in v3 - update purge rules; fixes #4603
Change-Id: Ic38722b3080edc3f9a9f8d35d4b2271d34b63872
Former-commit-id: 1cabae50b1 [formerly 1cabae50b1 [formerly a9bc901ed4b9157a4cb1a042d5fabe628cfd4b2a]]
Former-commit-id: 88a8dddef3
Former-commit-id: 00a056c154
|
2014-09-19 11:14:09 -05:00 |
|
Steve Harris
|
fdc523a026
|
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: 091555cf10 [formerly 091555cf10 [formerly 69c52fb4a22997d0a0f9c620bd20f00b8c5fd4ce]]
Former-commit-id: 4c56844e29
Former-commit-id: 214b48dcb8
|
2014-09-19 10:28:57 -05:00 |
|
Brian.Dyke
|
7e53a1d558
|
Merge branch 'ops_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: e1c88f287a [formerly e1c88f287a [formerly 5703d4fbb0fa5e422e3fbd62529928091a2bdb1f]]
Former-commit-id: 57a361073d
Former-commit-id: 4476b9d19e
|
2014-09-17 15:50:13 -04:00 |
|
Nate Jensen
|
1370795313
|
Omaha #3356 fix ingestGrib level factory initialization order
Change-Id: Iaad6d7aa9999f8387ed32806c655e5dee7e6a985
Former-commit-id: b516c4b8c8 [formerly b516c4b8c8 [formerly 0ed8b10495a08f1f120cfb3ed4e99e011e3db5a2]]
Former-commit-id: b89781c419
Former-commit-id: 57851af7d6
|
2014-09-16 13:24:46 -05:00 |
|
Stephen Gilbert
|
3106a4006c
|
Merge remote branch 'origin/master_14.3.1' into ncep_14.3.1
Former-commit-id: 5bf2ed644a [formerly 5bf2ed644a [formerly 2cf0da849d50a31d2ca54efeaf6e0258f33ff1d3]]
Former-commit-id: 440bddda4b
Former-commit-id: eee81971cc
|
2014-09-15 13:20:34 -04:00 |
|
Brian.Dyke
|
26b1938813
|
Merge branch 'master_14.3.1' into asm_14.3.1
Former-commit-id: 216f34fb25 [formerly 216f34fb25 [formerly 8e4f6e96f7b70d6f2b7517f3f0695350506169c7]]
Former-commit-id: 1541e4c255
Former-commit-id: ffa56ef950
|
2014-09-15 10:46:25 -04:00 |
|
Stephen Gilbert
|
bbabe5d087
|
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: 561b751e58 [formerly 561b751e58 [formerly 3775b0762b9d8529f5aa6630480d82e7ea62c1d8]]
Former-commit-id: 662436c2d5
Former-commit-id: a631e61fe5
|
2014-09-11 11:14:33 -04:00 |
|
Nate Jensen
|
eec3df9cd5
|
Omaha #3356 updates for improved level lookup
Change-Id: I32ca44114fb18770bff22c6d0c9173e8fa49a362
Former-commit-id: ae9cffaaea [formerly ae9cffaaea [formerly 0ca90b58d7ca85d5bfc8fc525415115ac8451c5b]]
Former-commit-id: 62b84b2fb3
Former-commit-id: f5ae895143
|
2014-09-09 15:38:53 -05:00 |
|
Brian.Dyke
|
a31d3d702e
|
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: 3d9a3de6e4 [formerly 3d9a3de6e4 [formerly a3365943e7b7972a5c86f8cb1ad39667ab9e0695]]
Former-commit-id: 01dfe503f5
Former-commit-id: c42733eb39
|
2014-09-09 11:44:30 -04:00 |
|
Brian.Dyke
|
66c4758f2d
|
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: 858b91d677 [formerly 858b91d677 [formerly 7b49ea6d9c45c0624017bbe7ffb1297a402ee875]]
Former-commit-id: af477df90e
Former-commit-id: 6c4b121752
|
2014-09-08 14:54:16 -04:00 |
|
Brian.Dyke
|
86e748a02e
|
Merge branch 'field_14.2.4' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.2.4
Former-commit-id: d7407481ef [formerly d7407481ef [formerly c1f870d9df7579741e5a1d79cdec77293115e968]]
Former-commit-id: 9f7fabb002
Former-commit-id: 6f4bdae843
|
2014-09-05 10:57:14 -04:00 |
|
Ana Rivera
|
3e1039b714
|
VLab Issue #4601 - Update to SMS DR #16720; Remove HRRR entries in master_grib2_lookup.txt; fixes #4601
Change-Id: I0dfe0991503e6d87ce2db9713bb016d68cd1c152
Former-commit-id: 6d48576930 [formerly 6d48576930 [formerly 084970f8445dbb6b76bbad84b5dc986d961d2383]]
Former-commit-id: a8b04b8e63
Former-commit-id: ac4f61813f
|
2014-09-05 13:27:29 +00:00 |
|
Stephen Gilbert
|
a0f6386a90
|
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: 32dffe58c8 [formerly 32dffe58c8 [formerly 72fa8af848f1452a517a62c6a54eae265a9ec8a1]]
Former-commit-id: 75277cb034
Former-commit-id: 3da185fa1a
|
2014-09-03 14:33:37 -04:00 |
|
Brian.Dyke
|
4425e3db61
|
Merge branch 'field_14.2.4' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.2.4
Former-commit-id: f0875e724f [formerly f0875e724f [formerly 40efe51cafd5589ef0a640041ad0539e454b6f8d]]
Former-commit-id: 611e036e75
Former-commit-id: caf5f778e9
|
2014-09-02 16:30:51 -04:00 |
|
Steve Harris
|
e681e0a457
|
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: 793064063b [formerly 793064063b [formerly 8793dca41f756ba812206b48391caea6e593a657]]
Former-commit-id: 5d58625abc
Former-commit-id: d984dd538f
|
2014-08-29 10:17:52 -05:00 |
|
Brian.Dyke
|
8d7b13548f
|
Merge branch 'master_14.3.1' into asm_14.3.1
Former-commit-id: 6f3d0508e4 [formerly 6f3d0508e4 [formerly f34bc4f81eb5ac92ef306f73f8c34243d3f78e31]]
Former-commit-id: 2c25f68437
Former-commit-id: 2abed9c0eb
|
2014-08-29 10:19:02 -04:00 |
|
Baoyu Yin
|
88e01c26db
|
VLab Issue #4563 - AWIPS2_DR_17371 Changes made in MPE editor not available in D-2D; fixes #4563
Change-Id: I5f5c55486f209b89ecf276bb38d3d42c7f60d1d1
Former-commit-id: bf5bb1bacf [formerly bf5bb1bacf [formerly 5189ae1c3ce12320045c431d9552036ea9272cef]]
Former-commit-id: bfc550b378
Former-commit-id: 70b265dae2
|
2014-08-29 10:17:54 -04:00 |
|