Commit graph

3024 commits

Author SHA1 Message Date
Sarah Pontius
734cc8a441 VLab Issue #5682 - HLS/TCV SwIT Changes; fixes #5682
Former-commit-id: b5a49fa57d2168e4680b0329b99733e35381eeb9
2014-12-16 09:06:59 -07:00
Steve Harris
f03969281c Merge branch 'master_14.3.1' (14.3.1-38) into omaha_14.3.1
Former-commit-id: 8b512a56879fe37cdb5e3428f6f3d86f38349ed6
2014-12-15 13:31:21 -06:00
Sarah Pontius
9b8bdc88d5 VLab Issue #5674 - HLS/TCV Code Cleanup; fixes #5674
Change-Id: If31b2979fb741f0e258ae0e3a1323981826b3158

Former-commit-id: c044f5c349b27be19c6a3ea2abcc3c2294fc07a3
2014-12-15 09:54:17 -07: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
Lee Venable
4d212f1d09 Merge "Issue #3026 - Fixed the HPE bias query" into omaha_14.3.1
Former-commit-id: 51e1e12ff98b2f1270b0fbd43bd169c6adae6d76
2014-12-12 13:53:21 -06:00
Mike Duff
508cf4c1d5 Issue #3026 - Fixed the HPE bias query
Former-commit-id: f2d5395fe522e61edd5768f37b530299a197dd07
2014-12-12 11:16:15 -06:00
Steve Harris
6d47b052c1 Merge tag 'OB_14.3.2-8m' into tcv_14.3.2
Former-commit-id: 4d97e95a23e55e064a654fda3d05901043158d7a
2014-12-11 10:43:57 -06:00
Fay.Liang
8a4e1ba3ef Merge branch 'omaha_14.3.1' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.3.1
Former-commit-id: ea5b97f1f606210e70bbf616a0c9158f03f67b5e
2014-12-10 08:52:21 -05:00
Sarah Pontius
a12b79c69c VLab Issue #5595 - HLS/TCV remaining task work and bug fix for 14.3.2 SwIT; fixes #5595
Change-Id: I872c55de264205ee60c369802075b32b5753fe5d

Former-commit-id: f7aeeb643ec6302e5af82838992f68ecf48ce702
2014-12-09 12:49:45 -07:00
Ying-Lian.Shi
c4b665ad24 ASM #16929 Service Backup log cleanup script issue on test systems
Change-Id: I09f184a01081cf025854da60a298345b29ffc15f

Former-commit-id: 66fc128c8be25753904dfff65840334bfdff7963
2014-12-09 16:19:33 +00:00
Dave Hladky
8796705c6b Issue #3891 Special overlap handling for promotion of sub from site to shared
Change-Id: Ifa8f4be3e9e0f172ee54c5ef7021b912d45c5de2

Former-commit-id: 9a31befafe66a677b744fa9ae9ef7e134a758bd9
2014-12-08 14:36:44 -06:00
Fay.Liang
f5095bed4e Merge branch 'tcv_14.3.2' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.2
Former-commit-id: ad2451c4d92ef4dcb35f6a0a4ef6ef9403886963
2014-12-04 13:47:03 -05:00
Fay.Liang
19194e0aa3 Merge branch 'master_14.3.1' into master_14.3.2
Former-commit-id: 1fcac564095b86cd4c6103a6484b25bbff2339b2
2014-12-04 13:46:31 -05:00
Sarah Pontius
5d696b412d VLab Issue #5492 - Dec 2nd HLS/TCV Code Check-in for 14.3.2 SwIT; fixes #5492
Change-Id: I2d0b6fbe44cb2931fc0cd74a9361cf886b0c9565

Former-commit-id: 24c01f47449607347812e0e676f1d14849d3b47e
2014-12-03 11:19:06 -07:00
Fay.Liang
5bd22b74c6 Merge branch 'tcv_14.3.2' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.2
Former-commit-id: 9dd4c18d8a4d2f8741ff7e79c2018bbe6cd10fe9
2014-11-20 13:32:25 -05:00
Shawn Hooper
cf72b5753d VLab Issue #5395 - Build fixes and gfeConfig.py update
Change-Id: I94c02a82c7305dc9eb7d31bc941e6e7b0e4a7ba1

Former-commit-id: 94093accc4b2adc4c12cea0a3af0e037c1be52d8
2014-11-20 13:12:16 -05:00
Fay.Liang
45b80432d6 Merge branch 'tcv_14.3.2' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.2
Former-commit-id: 28c3dbd91c1e89ffffd19afa811a08e228a995dd
2014-11-19 22:07:54 -05:00
Ana Rivera
40855f4ebd Merge "VLab Issue #4953 Added support for managing JSON files in practice mode." into tcv_14.3.2
Former-commit-id: a0946643e3dab3f54c9d1d7a48dbb06b82207b55
2014-11-19 16:27:03 -05:00
Ana Rivera
af00fd8a98 VLab Issue #5382 - HTI Update: add GFE templates (O&M RM16791); fixes #5382
Change-Id: I1a37fafbb9c2846749a33dd85772f53ccfb514df

Former-commit-id: 7d9cf7bfb3f513314608b6269f437061fc36d090
2014-11-19 20:29:42 +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
Roger Ferrel
b88300a5fc Issue #3439 Replaced GFS213 with GFS229.
Change-Id: I6cd7774c4897273944c56c39d087bb5cf98f4b15

Former-commit-id: 6cb88075375e3703b5ffe559ebd5e4f57d016880
2014-11-18 17:42:39 -06:00
Mike Duff
f841f1eda9 Issue #3026 - Fixed pattern to match the actual file names
Change-Id: I957e2076cfa5ee4d59acc1a0db89066e446bfc99

Former-commit-id: 5a3ccbadbf08957a4f68a0cb7118c765ca44f849
2014-11-18 13:54:17 -06:00
Fay.Liang
8ced3a4c73 Merge branch 'tcv_14.3.2' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.2
Former-commit-id: 7fd3b02016b0d9eed7ecca9c2fd70c3f83695abc
2014-11-14 12:47:46 -05: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
Fay.Liang
cfe2f18790 Merge branch 'tcv_14.3.2' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.2
Former-commit-id: 3f94c7f0ddbf580576b435a715366e3b9f3d9a53
2014-11-13 11:50:16 -05:00
Lee Venable
f5bcc5b2c2 Merge "Issue #3026 - fixes to data access for HPE label generation" into omaha_14.3.1
Former-commit-id: 389c35bce7c456154321605c3415c43431a46c7b
2014-11-13 09:31:57 -06:00
Mike Duff
15f9d1ef50 Issue #3026 - fixes to data access for HPE label generation
Former-commit-id: 8d30af1c970cca70fe74560d3157e754e1164785
2014-11-12 18:34:32 -06: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
654c831b4e Issue #2854 Fix merge issue in MessageProducer between DRs 2726 and 3684
Change-Id: I6a6ea9c57857459f61e955a54275a8983a8004ce

Former-commit-id: 09f13d9b33cfe3547d2dc3fb75c1673e1f3193b0
2014-11-12 11:25:32 -06:00
Fay.Liang
4bef6cf18d Merge branch 'tcv_14.3.2' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.2
Former-commit-id: a141921090ecec459e99d448025f58ca6a957fa6
2014-11-10 14:08:25 -05:00
Sarah Pontius
061583cd50 VLab Issue #5277 - HLS/TCV code for OPG 11-17-2014; fixes #5277
Change-Id: I258b2f8c8ddb7f45b02b1035f6fa5006b9fabe1b

Former-commit-id: 0db3944372ecc381df4e8a918829530391d598db
2014-11-10 11:20:09 -07:00
Brian.Dyke
acf00264f4 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
Shawn.Hooper
f8ee619f16 ASM #15033 - Allow generic warning types to show up continuously during Warning cycle
Change-Id: I6e0884b1bbc1e4bed3300bb9dc0f0b3f779aa212

Former-commit-id: 41e18e5104eac8ee3335a80d678d74c7a56b196a
2014-11-03 10:30:05 -05:00
Shawn.Hooper
ec3b831987 ASM #16800 - Add HRRR under D2D in Weather Element Browser
Change-Id: I829cd7357ccd37e389e88567a4159d0efde9aa41

Former-commit-id: 99807ddc4810c08635d5462357dc29e661686e33
2014-10-30 14:47:26 -04:00
Brian.Dyke
01c3167dc9 Merge branch 'tcv_14.3.2' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.2
Former-commit-id: bc44629025f7070a97fcff4a00939e509e6987b1
2014-10-29 16:39:06 -04:00
Sarah Pontius
760c0d6532 VLab Issue #5129 - Merging code from tropical_hazard_formatters to tcv_14.3.2; fixes #5129
Change-Id: Ia7365620c5cc803faa25af4d6c32d3e394497626

Former-commit-id: eee97946890b5b0df941e2665a4a183eece14598
2014-10-29 13:33:24 -06:00
Brian.Dyke
94ddd59bfc Merge branch 'ops_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: d12d6cf7e6862a87c00f833ee02e72e5c0ad8252
2014-10-28 15:25:05 -04:00
Brian.Dyke
765359aee6 Merge branch 'ops_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Conflicts:
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/VM_global_library.vm

Former-commit-id: 52ba693c7d77f4e29db6bc5202c9764509bce58d
2014-10-28 15:23:11 -04:00
Baoyu Yin
4252ccfcb1 VLab Issue #4796 - AWIPS2_DR_17420 WarnGen templates and 14.2.1 template corrections UPDATE on Oct 28 fix for FFW error ; fixes #4796
Change-Id: I4f43f1365c3ad4d11314f199c4d896aa542a48c0

Former-commit-id: 54d2f956f53d2fe8a6fa0550a4236d95013b8ba8
2014-10-28 14:32:31 -04:00
Ron Anderson
8362946f0e Issue #3766 Fixed return type of GridParmManager.createNewDb
Change-Id: Ib76bf614b09895ef08065da86d3af8d59f490f4c

Former-commit-id: 2e2f83952a6ef00b17d9f4504133c85e93e0126e
2014-10-27 18:40:15 -05:00
Baoyu Yin
bb89f99643 VLab Issue #4796 - AWIPS2_DR_17420 WarnGen templates and 14.2.1 template corrections UPDATE on Oct 27 ; fixes #4796
Change-Id: I636b0cbb46b31f46cb2d017a4b3047108c98f0c9

Former-commit-id: b447742f498bceaf5f522a637d6ae501f80dfa23
2014-10-27 10:15:39 -04:00
Baoyu Yin
fe574dd41d VLab Issue #4796 - AWIPS2_DR_17420 WarnGen templates and 14.2.1 template corrections UPDATE on Oct 24 ; fixes #4796
Change-Id: I2df1ea83b9cd17735ee835914febd3739ff4671d

Former-commit-id: ecc2b0c99a4e849b9472dd6c0cd63416e880d4cb
2014-10-24 14:28:08 -04:00
Brian.Dyke
abb4203634 Merge branch 'asm_14.3.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.3.1
Former-commit-id: c8cd8594507148284ac3ec2283fcc9e152c532a6
2014-10-22 10:39:36 -04:00
Shawn.Hooper
ddeec493c3 ASM #13467 - Update GenericHazards.py for Shannon
Change-Id: Ic1131929aa14f97cff0e1cf92e30c338470f368e

Former-commit-id: f4e8f7493bbfb025e8040f7663dc582414a87413
2014-10-21 11:11:34 -04:00
Slav Korolev
079b74d69c Issue #2757 - Fixed a problem with duplicate zones.
Former-commit-id: 8929c542c33090555dd9db16113453e1000c6e5b
2014-10-20 13:08:44 -04:00
Dave Hladky
5cde2fa48c Issue #3736 Allow shared subscriptions to have adhocs
Change-Id: I2379ac2cd1f02b36587531b448b8c3e6434664f9

Former-commit-id: a5a2b995e5dd4a7af165f62496d8052ed43d23b4
2014-10-20 08:58:08 -05:00
Nate Jensen
cfb24faf68 Merge "Issue #3707 Reworked gridded subscription triggereing for retrievals. Change-Id: I4abded9b531c7b7e9b9058760b97b8f5e778d176" into omaha_14.3.1
Former-commit-id: 57848f31cc73d81d16595e4e5b01949bcff12a24
2014-10-20 08:37:41 -05:00
Dave Hladky
c7df290186 Issue #3707 Reworked gridded subscription triggereing for retrievals.
Change-Id: I4abded9b531c7b7e9b9058760b97b8f5e778d176

Former-commit-id: eb64bd232cd25a71dbac655f4d59f9ec10b841b4
2014-10-17 16:01:47 -05:00
Brian.Dyke
93df82ac92 Merge branch 'asm_14.3.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.3.1
Former-commit-id: f0f79fb324665245ef759947d24514a6c8bc4470
2014-10-16 12:04:27 -04:00
Shawn.Hooper
118f34bbf1 ASM #13467 - Fix for GFE: Need to add Beach Hazards Statement
Change-Id: I9d19a76afff8e4c36db20aec15b997eefc260209

Former-commit-id: 366c7c478c6d83f8d21e3b30cc664a32cabf08bd
2014-10-16 11:30:29 -04:00