xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
8687 commits 31 branches 40 tags 3.8 GiB
Commit graph

70 commits

Author SHA1 Message Date
Steve Harris
4de63454fc Merge tag 'OB_15.1.1-16' into omaha_16.1.1 
15.1.1-16

 Conflicts:
	cave/com.raytheon.viz.gfe/build.properties
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/AbstractGridResource.java (moved to ufcore)
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/reference/MapManager.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.uf.edex.activetable/utility/common_static/base/vtec/ActiveTable.py
	edexOsgi/com.raytheon.uf.edex.activetable/utility/common_static/base/vtec/MergeVTEC.py


Former-commit-id: 9f115206966a85c409a731e51bb4360c44ccc7fc
 2015-06-05 15:38:00 -05:00
Bruce.Hundermark
8f9f0f09ba ASM #17515 - GFE - RTMA and URMA parameter corrections 
Change-Id: I1d7f009e8ec48beee75f9369fa54f41feecaadc8

Former-commit-id: 0ddcb5c8e6d8b254d899e8bda2579fe12fa7692e
 2015-06-03 21:19:25 +00:00
Steve Harris
9b3d8a8443 Merge tag 'OB_15.1.1-12' into omaha_16.1.1 
15.1.1-12

 Conflicts:
	build/deploy.edex.awips2/esb/bin/setup.env
	cave/com.raytheon.uf.viz.useradmin/src/com/raytheon/uf/viz/useradmin/ui/UserAdminSelectDlg.java
	cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/headline/FormatterRunner.py
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/PolygonUtil.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/smartinit/Init.py


Former-commit-id: 881df1ae809fb94151c7bddc8eeda305ac4317f7
 2015-05-20 11:25:45 -05:00
Bruce.Hundermark
15db360d00 ASM #17144 - GFE: Add Capabilities for CONUS real-Time Mesoscale Analysis at 2.5km 
Change-Id: Id759bf52cfcf7ee7a13e65facf3dfd32be9feb22

Former-commit-id: a1f4da43d6b9271789ca42f71c3d7334f8a6b773
 2015-05-13 14:47:16 +00:00
Nate Jensen
397fa4a07e Omaha #4259 gfe changes for jep upgrade to 3.3 
Change-Id: I5887537b7bcd05ea289fdd04851618264829987d

Former-commit-id: 83ba21f361e4c528115533ca72be8efd0109eb9d
 2015-05-07 09:02:20 -05:00
Steve Harris
7375074ed8 Merge tag 'OB_15.1.1-2m' into omaha_15.1.1 
15.1.1-2m

 Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.edex.plugin.radar/src/com/raytheon/edex/plugin/radar/RadarDecoder.java
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template


Former-commit-id: 7cad81591e22bc1a46f54982f0cd0ca647208290
 2015-03-30 11:07:52 -05:00
Ron Anderson
8c54ff2f61 Omaha #4300 Client-side changes for multi-site service backup 
Change-Id: Ibcf05dfc67fa3824a5fe716e1d4038ad5aeb4034

Former-commit-id: 8daff8d5bb3e1bbf23a559671040cae4a03c9911
 2015-03-23 16:08:31 -05:00
Fay.Liang
b23791cfbd Merge branch 'ops_15.1.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_15.1.1 
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py

Former-commit-id: 5879ba157369936274e88800e4f178e67567de95
 2015-03-19 12:45:22 -04:00
Ron Anderson
7bbd4b6a25 Omaha #3955 Additional updates to try to make the procedures more bulletproof. 
Change-Id: Ie4c9d02c880dd460ef3470db9c68f5a67c0e924c

Former-commit-id: 1ff0a8ab8715a780fdc14db7f81f1708567fdc78
 2015-03-12 16:23:37 -05:00
Baoyu Yin
7ed46744e4 VLab Issue #6619 - AWIPS2_DCS_14537 GFE Add parameters to RUC13 parameterinfo file; fixes #6619 
Change-Id: I13b350ee4f5685a723f78473d07003683b058e68

Former-commit-id: b28cfa863daf9e156855791c4d015dfe5a379c27
 2015-02-25 14:13:53 -05:00
Roger Ferrel
112c0322b2 Omaha #4053 Added Great Lakes Wave Model 2.5KM to product browser, volume browser and GFE. 
Change-Id: Iabb0b401a51e7fbb069ed8c6e7b44e2d9382c421

Former-commit-id: 66098b89fcf6cd5bcf950024c5a40722018b02d5
 2015-02-12 13:43:37 -06:00
Steve Harris
118f52263f Merge branch 'omaha_14.4.1' into omaha_15.1.1 
Former-commit-id: ffee274d844442a36d633deda5776c09a758cb38
 2015-02-12 12:48:29 -06:00
Fay.Liang
43c7161dcf Merge branch 'master_14.3.2' into master_14.4.1 
Conflicts:
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/PointPrecipPlotResource.java
	cave/com.raytheon.viz.mpe/src/com/raytheon/viz/mpe/util/DailyQcUtils.java
	edexOsgi/com.raytheon.edex.plugin.gfe/.settings/org.eclipse.jdt.core.prefs
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/textproducts/AreaDictionaryMaker.java
	edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTableSrv.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.service/src/com/raytheon/uf/edex/datadelivery/service/services/overlap/SubscriptionOverlapHandler.java
	rpms/awips2.core/Installer.java/1.7/component.spec

Former-commit-id: e91a78eec910b84f44350d3aae68a26f4e0dcd72
 2015-02-09 17:19:41 -05:00
Steve Harris
afb3d31759 Merge tag 'OB_14.4.1-6m' into omaha_15.1.1 
14.4.1-6

Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py

Former-commit-id: 9fd5ed1aea1a667552144da88dcc394a99133c52
 2015-02-03 12:25:05 -06:00
Steve Harris
47234a3757 Merge tag 'OB_14.4.1-5m' into omaha_15.1.1 
14.4.1-5

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

Former-commit-id: 28075dabb4b6421ddaee3af71518f565d9bc7e90
 2015-01-28 13:45:36 -06:00
Ana Rivera
20ad0a65f3 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: 291d66c66af4f1f4d298185412d5930714ffb2c5
 2015-01-27 22:05:59 +00:00
Ana Rivera
327945af8b 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: Ia5c04c409d08280ae09f9999b2c6883fc0b47e18

Former-commit-id: 889608360567b829f81ed6392c64c669798f34a9
 2015-01-27 16:28:42 +00:00
Ana Rivera
7c25945fd9 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: 51ef304bd94fd003a1e7349a22c41e21b340ac8a
 2015-01-26 18:45:26 +00:00
Steve Harris
9234ceb485 Merge tag 'OB_14.4.1-2m' into omaha_15.1.1 
Conflicts:
	cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/SmartScript.py (self-resolved)
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/grid/dataset/alias/gfeParamInfo.xml (took both Anna and David's additions)
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py (took both Anna and David's additions)

Former-commit-id: 01c4aa19ab0b21f331c2200076efbd44eb3b2af6
 2015-01-23 09:32:44 -06:00
David Gillingham
4604975854 Omaha #4014: Add ingest and display support for ETSS model. 
Change-Id: I5bff5985d779a9d665cbe5a005171b2076212846

Former-commit-id: fa7e11a22b47a48d2bc7b9cf6f0ddfd97ea2fea7
 2015-01-20 14:02:06 -06:00
Joshua Watson
5aa4748569 VLab Issue #5238 DR_14024 Code changes for gridded LAMP modifications; fixes #5238 
Change-Id: I9e13afd8f7736f71fe8d584b1ff9a5b1ec943667

Former-commit-id: 5f730d514fd3e4b6780d7a3d60dcb08b102ecd29
 2014-12-17 08:38:27 -05:00
Ana Rivera
1823ed3596 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: 111ae763e6becb944e34e262e1d87d2d344236e4
 2014-12-16 23:39:02 +00:00
Ron Anderson
2c99ce902a VLab Issue #4953 Added support for nwrwavestcv and sending TCV files to VTEC partners 
Change-Id: I2af1f2eaf0625ea58153ebebc1ad10bb76da52bd

Former-commit-id: 18ab45bdae51ae9971a0c5f4b4bde7afe82074d4
 2014-12-12 17:25:52 -06:00
Richard Peter
8de1ebcb65 Merge tag 'OB_14.3.2-8m' into omaha_14.4.1 
Conflicts:
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/PointFreezePlotResource.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/PointPrecipPlotResource.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/PointTempPlotResource.java
	edexOsgi/com.raytheon.edex.common/src/com/raytheon/edex/utility/EDEXLocalizationAdapter.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/textproducts/AreaDictionaryMaker.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/textproducts/Configurator.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/AbstractWatchNotifierSrv.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/SPCWatchSrv.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/TPCWatchSrv.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/textproducts/Generator.py
	edexOsgi/com.raytheon.edex.plugin.warning/res/spring/warning-ingest.xml
	edexOsgi/com.raytheon.uf.edex.activetable/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.edex.activetable/res/spring/activetable-ingest.xml
	edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/decoder/PracticeVtecDecoder.java
	edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/handler/SendPracticeProductHandler.java

Change-Id: Ibd2a1524e6b4169679be97de2dcfe83e6a819df5

Former-commit-id: e190a710b1b9506c99120fdaa1ebfdb144fcbf6f
 2014-12-12 10:36:04 -06:00
Joshua Watson
bca4b40eed VLab Issue #4129 - DR_17246 Code changes for gridded MOS modifications; fixes #4129 
Change-Id: I4fc4436af321baf3b6057229b982f0aba35f5840

Former-commit-id: cfce2a5f633a7312b9ad64dafb559c834b0ceddf
 2014-12-11 11:39:00 -05:00
Roger Ferrel
597fdb8280 Omaha #3866 Added GFS20 to gfe. Latest changes to Pacific region. 
Change-Id: I2c12259947289efaa5ce03be7adce42cdca0a28a

Former-commit-id: 46d3bbcc99d93845dcb159012b872fe746756b7c
 2014-12-04 12:52:22 -06:00
Ron Anderson
ebeb4440ef Omaha #3875 Fixed SmartScript.createTimeRange(). Added API to better deal with local time. 
Change-Id: I8e6f79bf6b7754924480a39f1631ba10a12bdcae

Former-commit-id: e656ec3ccf20ae4a9eae23040e1a08d7032ee42a
 2014-12-02 11:45:05 -06:00
Ana Rivera
fe5bfbaa73 VLab Issue #5194 - Ingest and Display NWPS data; fixes #5194 
Change-Id: Ib617760363c10e72ee54fd9ca30656fd0b7bd02f

Former-commit-id: 6866439b0a7075f04146af4b4bdce59477269f4d
 2014-12-02 15:44:07 +00:00
Ana Rivera
5abf37ea62 VLab Issue #5472 - Revert VLab Issue #5034 (first NWPS code merge); fixes #5472 
This reverts commit f1f5f2c717 [formerly a72135fc85a602b67b929b6870edbaabf4dc8fc1].

Change-Id: I631bb1722abea96e08967a8d9fa9f175a886f685

Former-commit-id: 373acfce57d5e0044f13382b926cb2fc1f830e54
 2014-12-02 13:43:03 +00:00
Ana Rivera
1999049d90 Merge branch 'master_14.4.1' into emc_14.4.1 
Change-Id: I4984b06810f3484e919a4a4a5853435ca34167bb

Former-commit-id: c69e94f227cb908a9af2e1cd2db35b25bef28701
 2014-11-21 14:23:49 +00:00
Ron Anderson
9104023408 VLab Issue #4953 Added support for managing JSON files in practice mode. 
Change-Id: I081a11bd2ed9370c32354a0c5728400561f3d7f8

Former-commit-id: e8ac81c5850b8565ea1e375857cf9dfe531848a0
 2014-11-19 11:31:49 -06:00
Ana Rivera
e54f3305d8 VLab Issue #5318 - Baseline Hurricane Threats and Impacts (O&M RM16791); fixes #5318 
Change-Id: Ibbc9e39a294417524c57c86e68e92644433ba847

Former-commit-id: 8a4e53a23a222dc88e3db8cc053fc31c33d3ed42
 2014-11-14 16:58:11 +00:00
Ron Anderson
fe531a33e5 VLab Issue #4953 Added support for writing Python and/or Java objects to JSON localization files. 
Change-Id: Ie25fce637e4294dd20bcfa3933d29b7bf6cc1f30

Former-commit-id: c9d45db2fe6d4693c02b8788d0c7d44b21f5359f
 2014-11-12 14:50:21 -06:00
Ron Anderson
5d07d13aa0 Omaha #3685 Add support for sending specific products in mixed case 
Change-Id: I3c7e8bfe285ce7344ddfccf28173a68f3396b126

Former-commit-id: 18d4fc13ebbd77b3a476bc70252fae1322d631c6
 2014-10-22 14:29:30 -05:00
Ana Rivera
f1f5f2c717 VLab Issue #5034 - Ingest and Display NWPS model data; fixes #5034 
Change-Id: I836ffda083281073f5cf1d20de79f73091d49426

Former-commit-id: a72135fc85a602b67b929b6870edbaabf4dc8fc1
 2014-10-22 17:03:07 +00:00
Ron Anderson
fa7b06c454 VLab Issue #4953 Refactored TPCWatchSrv to support TCV effort. 
Change-Id: I8a5c5c7fa62235fdc6fa4d90e82ff2711e724a15

Former-commit-id: 9a2a6989687c749ee87291506a7ee44a6cd7e737
 2014-10-08 11:51:00 -05: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
Ana Rivera
088ebd2ca2 VLab Issue #4154 - DR_14068, DCS_53 Add 3 RTMA parms, add AK RTMA 3km; closes #4154 
Change-Id: If6af5c54b31911a954295ce4ae60c9d9449d4b55

Former-commit-id: 9c3460d34513dd2f54643b87cb8afd122d94ea9c
 2014-07-21 21:41:17 +00:00
Richard Peter
8ecc27f714 Merge branch 'omaha_14.3.1' (14.3.1-12) into omaha_14.4.1 
Conflicts:
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/datastructure/LoopProperties.java
	cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
	edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/AbstractWatchNotifierSrv.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/SPCWatchSrv.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/TPCWatchSrv.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/WCLWatchSrv.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/WclInfo.java
	edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
	edexOsgi/com.raytheon.edex.plugin.warning/WarningDecoder.py

Change-Id: I6208fb3e1589dd3f2356f19ea9bbdfaa79ae6d61

Former-commit-id: fc71e1cb26481e91c7d0c16ed0bd06ec5c8c22b9
 2014-07-01 15:34:39 -05:00
Steve Harris
7acd9ab2dd Merge branch 'master_14.2.2' (-16) into master_14.3.1 (-11) CM-MERGE:14.2.2-11,-12,-13,-14,-15,-16 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/dialogs/sbu/ServiceBackupDlg.java
	cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/GisUtil.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/PortionsUtil.java
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/postProcessModels/postProcessedModels.xml
	edexOsgi/com.raytheon.edex.plugin.shef/res/spring/shef-ingest.xml
	edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java

Change-Id: Ia1c3637d1d6ee482896c9d7a41d77752d70317f5

Former-commit-id: d25ab509cb53d559edbd520dd1e3c036166f2e29
 2014-07-01 11:08:46 -04:00
Roger Ferrel
ad6eac6e20 Omaha #3230 Add URMA. 
Change-Id: Iba46e07d2ff96029ae560b1232d3610b326d70df

Former-commit-id: c6abaff91bc493c9a40e39a66afd2b2262697343
 2014-06-26 11:16:09 -05:00
Brian.Dyke
9ab17ddecb Merge branch 'master_14.1.3' into master_14.2.2 CM-MERGE:14.1.3-1 into 14.2.2 
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py

Former-commit-id: 797aa6bfbf2802aa7355b7a4a77d0fb4f54dfd6a
 2014-06-10 13:56:03 -04:00
Brian.Dyke
8874d41872 CM-MERGE:OB13.5.6-1,-2 into 14.1.3 
Former-commit-id: b859032bcec187616adfd414dd1ce5fe27829e9e
 2014-06-10 12:52:59 -04:00
Kenneth Sperow
9fa9425aea Merge remote branch 'origin/master_14.3.1' into field_14.3.1_merge Merge up to 342398e6a3 [formerly ddeadcf968d945a322e8a9c8a8d25753782887f0] 
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/purge/gridPurgeRules.xml

Change-Id: I2005791595cbb8303d385ed4c397e1997e7ce38f

Former-commit-id: 41ee30cbe04bb6cba695f7480d6b1492aec4219c
 2014-05-22 14:16:49 -07:00
Ana Rivera
81a9d4fa44 VLab Issue #3648 - DR_16999 Display ESTOFS Model Data; closes #3648 
Change-Id: Ieea41d201e94b4486cce0c4ec70a2c02b65838f1

Former-commit-id: e71ef5db23122405fc6aab71526a9cc3ec3ad823
 2014-05-12 18:55:06 +00:00
Ana Rivera
1b4450ec5f VLab Issue #3617 - DCS_266 Ingest & Display HRRR Model Data 
Change-Id: Ic43d3a3f51d70cd41ef8e34ccde9d1f5aee3007b

Former-commit-id: c5a4f22a24b6c1eced689c6ae437558a9a6cbc9e
 2014-05-08 20:10:24 +00:00
Richard Peter
32957285fc Merge branch 'master_14.3.1' (14.3.1-2) into omaha_14.3.1 
Conflicts:
	cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/CaseCreationDlg.java
	cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/GenerateCaseDlg.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.edex.utilitysrv/res/spring/utility-request.xml
	edexOsgi/com.raytheon.uf.common.colormap/src/com/raytheon/uf/common/colormap/image/Colormapper.java
	edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/SerializationUtil.java
	edexOsgi/com.raytheon.uf.edex.textdbsrv/res/spring/textdbsrv-request.xml

Change-Id: I316979d4036b2e2d05b361c8c466747b04ee4900

Former-commit-id: 311c52426b3715d3a73c1fa79a8fd427a4b1b09d
 2014-04-28 16:27:40 -05:00
David Gillingham
6ca193b8e9 Issue #2897: Add support for Multi-grid Hurricane Wave Models to D2D and GFE. 
Change-Id: I66e609d17afcfc900ceaf1b1eed328320d022fbb

Former-commit-id: 33197dc6708b65e85233b51be1e99e6411ece60f
 2014-04-25 10:56:43 -05:00
Brian.Dyke
3524838f9f Merge branch 'master_14.2.2' into master_14.3.1 
Merge (14.2.2-5 into 14.3.1-1)

Conflicts:
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/GFESpatialDisplayManager.java
	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
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py
	edexOsgi/com.raytheon.uf.common.archive/src/com/raytheon/uf/common/archive/config/ArchiveConfigManager.java
	edexOsgi/com.raytheon.uf.common.python/utility/common_static/base/python/MasterInterface.py
	edexOsgi/com.raytheon.uf.edex.datadelivery.registry/src/com/raytheon/uf/edex/datadelivery/registry/federation/RegistryFederationManager.java
	edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/services/lifecycle/LifecycleManagerImpl.java

Former-commit-id: f54d2c639a915db14f01f56a7fcc5841b60e1509
 2014-04-25 11:06:11 -04:00
Brian.Dyke
35ad867281 Merged 13.5.5-1 into 1412 
Former-commit-id: f44629e87a6401a5b872c050b9cf79defd306171
 2014-04-16 12:09:12 -04:00