Commit graph

396 commits

Author SHA1 Message Date
mjames-upc
0b01029e68 cleaning up unidata_15.1.1 enough to launch in eclipse 2015-12-29 20:15:31 -07:00
Ron Anderson
87286949fd Omaha #4027 More GFE changes for Mixed Case WA
Change-Id: Ia1b65979d442246984b1e281c902c9f078fa4848

Former-commit-id: 0eef8697e269644ec36c1c7f7b09610778beb4a1
2015-04-20 17:17:08 -05:00
Ron Anderson
e6cfc5f40d Omaha #4027 Convert all GFE text products to mixed case
Change-Id: I94275b65e8733d5bed1242f78503f1613b2e0aff

Former-commit-id: 07088e71d78d6302da23683894d96d72e4f69a96
2015-03-26 18:30:39 -05:00
David Gillingham
fd5b270fdd Omaha #4103: Update GFE service backup server code to support multiple service backup sites, use "smarter" lock files to store additional status.
NOTE: Service Backup features are broken until DR 4300 lands on this branch.

Change-Id: Ic0184c10c553187c8d0515f639c5a33fd3abde1f

Former-commit-id: 732208b6600882a9ba9fcc0eefd7c8be0157beab
2015-03-19 16:13:56 -05:00
Ron Anderson
61cb550ad4 Omaha #4246 Changes to support VCModules at base, site, and user levels
Change-Id: I995ad5c185ec8c5f0056f28f7e2e1c5b5d7395fc

Former-commit-id: 33c2ab1111deb0ede6a3196d889475bc69dd63d4
2015-03-12 18:09:58 -05:00
Steve Harris
4088396ba5 Merge tag 'OB_14.4.1-15m' into omaha_15.1.1
Former-commit-id: 4fe28e2a0013f77c8a04a56789fc4e101039d77f
2015-03-04 21:06:10 -06:00
Mark Peters
82ddd6a608 Omaha #4179 Abstract out getAvailableValues()
Change-Id: I6cceaf0e91db04eda2be76e687015d02cd91f0db

Former-commit-id: 1a0b9f20a89fcaca55e9af51c6f0996a99b65af5
2015-02-27 14:24:46 -06:00
Mark Peters
1a06ec06a9 Omaha #4179 Implement getAvailableParameters() for GFE retrieval through DAF
Change-Id: I218934553f13802cc15cda8196141bcd53a54ca2

Former-commit-id: 2e93a9883f03d5a53889f1c14a28bc89bceb0188
2015-02-26 18:07:41 -06:00
Nate Jensen
29bf0fc879 Omaha #3978 use InputStream instead of LocalizationFileInputStream or
read()

Change-Id: Ief0137559617f15ac9d7f6510b74630affa5aed5

Former-commit-id: 3a6c19cccad2a8ae2db0a49c47d737a5c5e0436c
2015-02-24 09:57:11 -06:00
Richard Peter
1184d7629c Omaha #4125 - Fix jaxb performance issue
Change-Id: I7b306098a96b86fb5a9c1262b2fb92f5f24ba0b1

Former-commit-id: 9f81dd0ec5e00827f5a9a98376f15c5139908ce1
2015-02-19 14:25:12 -06:00
Richard Peter
933960d2bf Omaha #4125 - Fix jaxb performance issue
Change-Id: I7b306098a96b86fb5a9c1262b2fb92f5f24ba0b1

Former-commit-id: f9fa25b783 [formerly 1184d7629c [formerly 9f81dd0ec5e00827f5a9a98376f15c5139908ce1]]
Former-commit-id: 1184d7629c
Former-commit-id: 5f93f3b5d9
2015-02-19 14:25:12 -06:00
Nate Jensen
4614f46877 Omaha #3978 ensure deriv param dirs are included in viz installs
Change-Id: If100bac39560644549b0d9a0a56e8406d403fb0a

Former-commit-id: 006c34d40cf2f2165109ea2ef785dfe6c3ebc0ff
2015-02-18 15:16:07 -06:00
Ron Anderson
a3bced0160 Omaha #4139 Fix handling of pre-epoch dates in ISC
Change-Id: I116f35c34544319bf9875aaeea82d24751b2cca2

Former-commit-id: 2718eab540d66cac4ac88f01b840bdf23bc0562b
2015-02-18 11:28:34 -06:00
Ron Anderson
40d7dbbf9a Omaha #4139 Fix handling of pre-epoch dates in ISC
Change-Id: I116f35c34544319bf9875aaeea82d24751b2cca2

Former-commit-id: 3d100c7bd6 [formerly a3bced0160 [formerly 2718eab540d66cac4ac88f01b840bdf23bc0562b]]
Former-commit-id: a3bced0160
Former-commit-id: 3ec014a0a9
2015-02-18 11:28:34 -06:00
Nathan Bowler
a7353a5ff0 Omaha #2866 Calculate subgrid size to limit response sizes
Change-Id: I3ccc8f7fa6e63f9bf5bf3bc7487aa38df3cc76c1

Former-commit-id: 6620a7bdc7da9d1c2edcb49b710db425f5a1c110
2015-02-10 15:25:05 -05:00
Steve Harris
2c559f4c88 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
Ron Anderson
596149053f Omaha #3955 Changes to support editing GFE topo and comparing with new Standard Terrain data
Change-Id: Ic12b1e257b7997fc2fbc5efd7a8833ac26366135

Former-commit-id: 653d8ec5a7adfc2ebb87ec6cbde2715f9c8fcfe9
2015-01-19 14:02:42 -06:00
Ron Anderson
5dfd9d6f8c Omaha #3955 Move GridType enum into GridParmInfo where it belongs
Change-Id: Ia9265527302d8ff9213e8f55f63e5b6b91bdcd98

Former-commit-id: 9bad7ebc912f6dbf9642f250494a992bc522252c
2015-01-16 12:33:52 -06:00
Fay.Liang
c6bd5d7675 ASM #15311 - Merge and Build Support - Merge ASM delivery into 14.4.1-1m.
Merge branch 'asm_14.4.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.1

Conflicts:
	cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/SmartScript.py
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/ChooseDataPeriodDialog.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java
	rpms/awips2.core/Installer.postgres/component.spec
	rpms/awips2.core/Installer.python/component.spec
	rpms/awips2.core/Installer.tools/component.spec
	rpms/python.site-packages/Installer.h5py/component.spec
	rpms/python.site-packages/Installer.matplotlib/component.spec
	rpms/python.site-packages/Installer.nose/component.spec
	rpms/python.site-packages/Installer.pupynere/component.spec
	rpms/python.site-packages/Installer.qpid/component.spec
	rpms/python.site-packages/Installer.scientific/component.spec
	rpms/python.site-packages/Installer.scipy/component.spec
	rpms/python.site-packages/Installer.shapely/component.spec
	rpms/python.site-packages/Installer.tables/component.spec

Former-commit-id: 1f331890b8fc38b4f8ed3a3debc66b8fedba4fdd
2015-01-12 13:03:31 -05:00
Fay.Liang
19a29da5de ASM #15311 - Merge and Build Support - Merge ASM delivery into 14.4.1-1m.
Merge branch 'asm_14.4.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.1

Conflicts:
	cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/SmartScript.py
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/ChooseDataPeriodDialog.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java
	rpms/awips2.core/Installer.postgres/component.spec
	rpms/awips2.core/Installer.python/component.spec
	rpms/awips2.core/Installer.tools/component.spec
	rpms/python.site-packages/Installer.h5py/component.spec
	rpms/python.site-packages/Installer.matplotlib/component.spec
	rpms/python.site-packages/Installer.nose/component.spec
	rpms/python.site-packages/Installer.pupynere/component.spec
	rpms/python.site-packages/Installer.qpid/component.spec
	rpms/python.site-packages/Installer.scientific/component.spec
	rpms/python.site-packages/Installer.scipy/component.spec
	rpms/python.site-packages/Installer.shapely/component.spec
	rpms/python.site-packages/Installer.tables/component.spec

Former-commit-id: eed6737801 [formerly c6bd5d7675 [formerly 1f331890b8fc38b4f8ed3a3debc66b8fedba4fdd]]
Former-commit-id: c6bd5d7675
Former-commit-id: 6b77894bd0
2015-01-12 13:03:31 -05:00
Zhidong.Hao
e443ced7f1 ASM #647 GFE: Files not getting purged out of /awips2/GFESuite/products/ISC
Change-Id: I656058629e2982a20312fca7f7024db82a8ad2fb

Former-commit-id: 133d3f229145c8ac84f31a8a6becc98688d189ae
2014-12-16 10:16:35 -05:00
Zhidong.Hao
b3980efbff ASM #647 GFE: Files not getting purged out of /awips2/GFESuite/products/ISC
Change-Id: I656058629e2982a20312fca7f7024db82a8ad2fb

Former-commit-id: c3b623cb6d [formerly e443ced7f1 [formerly 133d3f229145c8ac84f31a8a6becc98688d189ae]]
Former-commit-id: e443ced7f1
Former-commit-id: 9ab6bab9cf
2014-12-16 10:16:35 -05:00
Richard Peter
2457d0e6f7 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
Richard Peter
20fa07c6d3 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: 8de1ebcb65 [formerly 2457d0e6f7 [formerly e190a710b1b9506c99120fdaa1ebfdb144fcbf6f]]
Former-commit-id: 2457d0e6f7
Former-commit-id: 23eafaba3d
2014-12-12 10:36:04 -06:00
Fay.Liang
83a4987188 Merge branch 'master_14.3.1' into master_14.3.2
Former-commit-id: 1fcac564095b86cd4c6103a6484b25bbff2339b2
2014-12-04 13:46:31 -05:00
Fay.Liang
07316a588b Merge branch 'master_14.3.1' into master_14.3.2
Former-commit-id: 19194e0aa3 [formerly 83a4987188 [formerly 1fcac564095b86cd4c6103a6484b25bbff2339b2]]
Former-commit-id: 83a4987188
Former-commit-id: f327b9dd5a
2014-12-04 13:46:31 -05:00
Ron Anderson
bb451e58c3 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
Ron Anderson
fdafc8c3b8 VLab Issue #4953 Added support for managing JSON files in practice mode.
Change-Id: I081a11bd2ed9370c32354a0c5728400561f3d7f8

Former-commit-id: 9104023408 [formerly bb451e58c3 [formerly e8ac81c5850b8565ea1e375857cf9dfe531848a0]]
Former-commit-id: bb451e58c3
Former-commit-id: f88fc45470
2014-11-19 11:31:49 -06:00
Ana Rivera
061fd0af28 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
Ana Rivera
a469e36107 VLab Issue #5318 - Baseline Hurricane Threats and Impacts (O&M RM16791); fixes #5318
Change-Id: Ibbc9e39a294417524c57c86e68e92644433ba847

Former-commit-id: e54f3305d8 [formerly 061fd0af28 [formerly 8a4e53a23a222dc88e3db8cc053fc31c33d3ed42]]
Former-commit-id: 061fd0af28
Former-commit-id: 499c58a253
2014-11-14 16:58:11 +00:00
Ron Anderson
04b8ffbcd2 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
0bafb89898 VLab Issue #4953 Added support for writing Python and/or Java objects to JSON localization files.
Change-Id: Ie25fce637e4294dd20bcfa3933d29b7bf6cc1f30

Former-commit-id: fe531a33e5 [formerly 04b8ffbcd2 [formerly c9d45db2fe6d4693c02b8788d0c7d44b21f5359f]]
Former-commit-id: 04b8ffbcd2
Former-commit-id: 80670c1b7a
2014-11-12 14:50:21 -06:00
Steve Harris
a16abe1b8b 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: 565efec2ebe5a3a1a009d213a77617f4a593aa6b
2014-11-10 08:42:01 -06:00
Steve Harris
79a5171143 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: 9de825c332 [formerly a16abe1b8b [formerly 565efec2ebe5a3a1a009d213a77617f4a593aa6b]]
Former-commit-id: a16abe1b8b
Former-commit-id: a8a97501ac
2014-11-10 08:42:01 -06:00
Brian.Dyke
aae68215c8 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: 5c2079dd25181c68f872691e81842aff0f696f8d
2014-11-06 12:55:21 -05:00
Brian.Dyke
5cdd9f4256 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: acf00264f4 [formerly aae68215c8 [formerly 5c2079dd25181c68f872691e81842aff0f696f8d]]
Former-commit-id: aae68215c8
Former-commit-id: 4ac24af0a9
2014-11-06 12:55:21 -05:00
Benjamin Phillippe
7845e8e40f Omaha #3454 Upgrading to Hibernate 4.2.15
Change-Id: I4ab0970abf9755f69e09ad3d9c79084b76761c29

Former-commit-id: 293e59403b6d6e1d792d9fc6d8a0ac106a490bf5
2014-10-20 12:42:19 -05:00
Benjamin Phillippe
af4f8e1c8a Omaha #3454 Upgrading to Hibernate 4.2.15
Change-Id: I4ab0970abf9755f69e09ad3d9c79084b76761c29

Former-commit-id: fdd16051e8 [formerly 7845e8e40f [formerly 293e59403b6d6e1d792d9fc6d8a0ac106a490bf5]]
Former-commit-id: 7845e8e40f
Former-commit-id: e6deeb6fb5
2014-10-20 12:42:19 -05:00
Ron Anderson
4a1a3aef82 Issue #3684 Fix some issues found after #3684 with certain GFE configurations
Change-Id: I92b45588d9d4fe9169708c07119767017426d468

Former-commit-id: 6dc55b51414414aa416c9ad0c688d1d34ba08c17
2014-10-08 18:05:27 -05:00
Ron Anderson
0463c1c7a2 Issue #3684 Fix some issues found after #3684 with certain GFE configurations
Change-Id: I92b45588d9d4fe9169708c07119767017426d468

Former-commit-id: a64a36d182 [formerly 4a1a3aef82 [formerly 6dc55b51414414aa416c9ad0c688d1d34ba08c17]]
Former-commit-id: 4a1a3aef82
Former-commit-id: 8225700629
2014-10-08 18:05:27 -05:00
Ron Anderson
34eafba2da Issue #3684 Additional changes to keep IFPServers better synchronized
Change-Id: Ibb1f28d07a5792d4f23eb3232b75099b259a7064

Former-commit-id: 8a8f82e5916d4a71fa639eb16057e2c68276ecff
2014-10-07 11:51:39 -05:00
Ron Anderson
d25fb16e4a Issue #3684 Additional changes to keep IFPServers better synchronized
Change-Id: Ibb1f28d07a5792d4f23eb3232b75099b259a7064

Former-commit-id: bf5225906f [formerly 34eafba2da [formerly 8a8f82e5916d4a71fa639eb16057e2c68276ecff]]
Former-commit-id: 34eafba2da
Former-commit-id: de4015cee6
2014-10-07 11:51:39 -05:00
Steve Harris
39c5e9c314 Merge tag 'OB_14.3.1-24m' into omaha_14.4.1
Former-commit-id: df9ef1f664e14fa7843328338c5b234022f4bfd4
2014-10-06 13:57:59 -05:00
Steve Harris
53dc9657e2 Merge tag 'OB_14.3.1-24m' into omaha_14.4.1
Former-commit-id: 2db03d95b3 [formerly 39c5e9c314 [formerly df9ef1f664e14fa7843328338c5b234022f4bfd4]]
Former-commit-id: 39c5e9c314
Former-commit-id: 06a27b2d3c
2014-10-06 13:57:59 -05:00
Brian.Dyke
f440da9c70 Merge branch 'omaha_14.3.1' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.3.1
Former-commit-id: 23d16004c389f0ef708bee2a8bfb84d465b7b36b
2014-10-03 14:04:46 -04:00
Brian.Dyke
5da2026d2b Merge branch 'omaha_14.3.1' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.3.1
Former-commit-id: 92762f46c7 [formerly f440da9c70 [formerly 23d16004c389f0ef708bee2a8bfb84d465b7b36b]]
Former-commit-id: f440da9c70
Former-commit-id: 85d83aefe0
2014-10-03 14:04:46 -04:00
Brian.Dyke
f47840e4d9 Merge branch 'field_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: ece734cb6218a80fa2dda1b3c43673dc5a31bfbb
2014-10-02 10:24:04 -04:00
Brian.Dyke
d1c62c3542 Merge branch 'field_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: 2ac30f6c22 [formerly f47840e4d9 [formerly ece734cb6218a80fa2dda1b3c43673dc5a31bfbb]]
Former-commit-id: f47840e4d9
Former-commit-id: d4888adc0f
2014-10-02 10:24:04 -04:00
Ana Rivera
535f254357 VLab Issue #4669 - Add Beach Hazards Statement (RM 13467); fixes #4669
Change-Id: I54c1055b87b7bfab0a35fd391c6ef7156fc3d297

Former-commit-id: 2c16492202230dcbec93cf390b47f400a77a545e
2014-09-24 20:11:29 +00:00
Ana Rivera
17f629b3b6 VLab Issue #4669 - Add Beach Hazards Statement (RM 13467); fixes #4669
Change-Id: I54c1055b87b7bfab0a35fd391c6ef7156fc3d297

Former-commit-id: 9a0e9b17f4 [formerly 535f254357 [formerly 2c16492202230dcbec93cf390b47f400a77a545e]]
Former-commit-id: 535f254357
Former-commit-id: bb533d9ddd
2014-09-24 20:11:29 +00:00