Commit graph

6293 commits

Author SHA1 Message Date
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
Ana Rivera
c8a750b063 VLab Issue #5388 - HTI Update: replace 'MFL' references with SITE in HTI.xml (O&M RM16791); fixes #5388
Change-Id: I69ead4e0ed1103ca21728e46fa654ebaa85258a0

Former-commit-id: 27d2c6133b5563614b88fa03e3e706c6da2070a4
2014-11-20 13:57:19 +00: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
0879a27742 Merge "VLab Issue #5382 - HTI Update: add GFE templates (O&M RM16791); fixes #5382" into tcv_14.3.2
Former-commit-id: 78fc066cba9d5df0707d66a47c31ffbc05528214
2014-11-19 16:04:30 -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
Shawn Hooper
f88d320e60 VLab Issue #5375 - Update spec file for VADATUMS tar file.
Change-Id: Id4cb17192ca46af4dc731ebae260c9a8a3acfd13

Former-commit-id: 83e81ee0af2d612f08f32e760e9f4d00ee1dd7aa
2014-11-19 14:08:27 -05: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
f1009bccc2 VLab Issue #5355 - HTI Update: TCFloodingRainThreat.py (O&M RM16791); fixes #5355
Change-Id: I6461bf9294f037a361f02d3a0de83bf41147e819

Former-commit-id: 682cf4e6376265d0e590cfd1c05f7591204d0e0a
2014-11-18 16:06:22 +00: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
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
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
Sarah Pontius
cdb47ed221 VLab Issue #5012 - HLS/TCV files for OPG Oct-15-2014; fixes #5012
Change-Id: Iacf701775c343077102647136272c92d08776caa

Former-commit-id: c7b2c66316ccca08b56fe9ece8f8a24ec260207b
2014-10-15 10:15:30 -06:00
Sarah Pontius
6dee51cb9f VLab Issue #5001 - HLS/TCV files for OPG Oct-2014; fixes #5001
Change-Id: I4018168e958a75ff7db3dd6cfd88a4ac17947981

Former-commit-id: b7ccb5162f481e81dc50fcf63b200ab06a959cb8
2014-10-14 12:04:50 -06: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
Brian.Dyke
92762f46c7 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
20dd249d2c Merge branch 'asm_14.3.1' of winter:/data/gerrit2/git/AWIPS2_baseline into master_14.3.1
Former-commit-id: 441fc7561a8526422f9b73b9c47cd220f0babb54
2014-10-02 10:44:50 -04:00
Brian.Dyke
f3f95aabb0 Merge branch 'mdl_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: 8fa6749e28cb247ae63307f1423351c23ec0eb87
2014-10-02 10:38:51 -04:00
Brian.Dyke
2ac30f6c22 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
97464ea153 Merge branch 'ops_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: f26e54011d334972bb1e999304b1b2d13a1c408f
2014-10-02 10:15:34 -04:00
Steve Harris
cc34483b0b Merge branch 'master_14.3.1' (14.3.1-23) into omaha_14.3.1
Former-commit-id: ace8473f96c6151918ee8ecf61e3b8986d98a68a
2014-10-02 08:09:02 -05:00
Shawn.Hooper
ae02cbc2da ASM #15033 - Fix IBW templates and 14.2.1 template corrections
Change-Id: I2677b93f897640318d8f89da72e49ba398d1d720

Former-commit-id: ea8e4c3a30bceb2f3b53159317382ae651aa5531
2014-10-01 15:58:48 -04:00
Brian.Dyke
a4bfbea3c2 Merge branch 'master_14.3.1' into asm_14.3.1
Former-commit-id: 622e63224b6d6bf1d6ced874658bbd9db381799b
2014-10-01 15:36:06 -04:00
Nate Jensen
f2633a56c0 Issue #3679 fix bug when performance pref page changes
Change-Id: I15db22a05e5f50b2555c924f61cd52245963ef15

Former-commit-id: e2d5957c02ba210e1964d00f37a00455f3326b37
2014-10-01 11:53:40 -05:00
dmsys
9f4560c480 Merge branch 'master_14.2.4' into master_14.3.1 CM-MERGE:14.2.4-13-14 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/core/internal/IFPClient.java
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/specialWeatherStatement.vm

Former-commit-id: 0bf7ecb27d41f81f1d6727674fc1475eeaa8512c
2014-09-30 13:45:54 -04:00
Nate Jensen
510d26050d Merge "Issue #3669 Ensure best res does not parse alert messages." into omaha_14.3.1
Former-commit-id: 9e22fa02bb9f47d8332815059f2f5ae2d2ef6083
2014-09-29 17:50:34 -05:00
Ben Steffensmeier
95b096192b Issue #3669 Ensure best res does not parse alert messages.
Former-commit-id: e93157375f90c6cc2038db9a78346592e4d46b0e
2014-09-29 11:20:33 -05:00
Steve Harris
c03bc273da Merge branch 'master_14.3.1' (14.3.1-21,22) into omaha_14.3.1
Former-commit-id: 49ad8e0e780443a0439227694a92ec8ab683b125
2014-09-29 11:14:32 -05:00
Brian.Dyke
0e0255ce5b Merge branch 'asm_14.2.4' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.2.4
Former-commit-id: 6e79993fbf34ebd832ca07356cbac003efaf6405
2014-09-29 11:55:16 -04:00
Sean.Webb
2d531d73fd Merge "ASM #16720 - Added pushd and cd prior to patch extraction" into asm_14.2.4
Former-commit-id: c62a7e14e82c7274ed1868d73446aab895901546
2014-09-29 10:35:10 -05:00
Brian.Dyke
46af1d0857 Merge branch 'master_14.2.3' into master_14.2.4
Former-commit-id: 01cb1dc674ae1249d97dc10be5c068de0ed2a222
2014-09-29 11:20:57 -04:00
Sean.Webb
600b75bd9f ASM #16720 - Added pushd and cd prior to patch extraction
Change-Id: Iac7658d312721b1cc992a5c96a596120b6c5b225

Former-commit-id: c2af0284e9146dff8431ecd4f6ce88437ea83d9f
2014-09-29 10:24:04 -04:00
Sean.Webb
6e1f0363c8 Merge "ASM #16720 - Removed extraneous popd which was changing dir when not needed" into asm_14.2.4
Former-commit-id: 8f44d89f1d11cd587106f7eda3edec93802f5cf3
2014-09-29 08:31:44 -05:00
Sean.Webb
78f83fa594 ASM #16720 - Removed extraneous popd which was changing dir when not needed
Change-Id: I3c5521cfa0d0223cc8a6a3094d9efa7c6bf9f683

Former-commit-id: 4faea9724adf17d0bec7f013bafc7f8dd2f7499e
2014-09-29 08:21:00 -04:00
Brian.Dyke
142432ba5e Merge branch 'asm_14.2.3' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.2.3
Former-commit-id: 93ddf672c137c7221e9595e8b5c1b279084cb451
2014-09-26 16:14:06 -04:00
David Friedman
05707d0f20 ASM #15658 - WarnGen: inclusion of watch information in marine products
Change-Id: I13d9e58b1df3dd434cdea66060dbc5886c0e27f2

Former-commit-id: 78cc67f9d2f86c2088ffc5695c4dea879a9e2ebb
2014-09-26 20:05:46 +00:00
Brian.Dyke
814b9a2869 Merge branch 'omaha_14.2.4' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.2.4
Former-commit-id: 60756ddb841a0daa347493047b76d2fcb93f7f4a
2014-09-26 15:15:57 -04:00
Brian.Dyke
f1755fb7ae Merge branch 'asm_14.2.4' of winter:/data/gerrit2/git/AWIPS2_baseline into master_14.2.4
Former-commit-id: 4ff65f7c83042dd40b5c2bf37ee54d12315c5714
2014-09-26 14:20:34 -04:00
Brian.Dyke
f26fe97ec4 Merge branch 'field_14.2.4' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.2.4
Former-commit-id: 5b570e5229628de88068edee1c70c26eec13f71a
2014-09-26 14:19:03 -04:00
Brian.Dyke
a4f68caac6 Merge branch 'master_14.3.1' into asm_14.3.1
Former-commit-id: 6ed90023551e25216c10d05f2568593992326900
2014-09-26 13:02:49 -04:00
Sean.Webb
57342f0256 Merge "ASM #16720 - Added updated palt.c to fix seq num in pqact pattern" into asm_14.2.4
Former-commit-id: d1ce11d690a1acf24fe82fc10acc83302e8f61f9
2014-09-26 11:01:04 -05:00
Brian.Dyke
bd983e1932 Merge branch 'omaha_14.2.3' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.2.3
Former-commit-id: d6369c8346d1ed4d86ed3eb7adc47de0891c7fd7
2014-09-26 11:47:38 -04:00
David Friedman
db29ec9dec ASM #15551 - WarnGen: only WCN should be used while including TOR/SVR watches in WarnGen products
Change-Id: I8b8e9ae40596e5a3d5f0aa44d2e946aa7a68a1ae

Former-commit-id: c8aa2fbfc35c872e2d50de2212eaf16db9b5483d
2014-09-26 15:13:56 +00:00
Sean.Webb
7d75d994c1 ASM #16720 - Added updated palt.c to fix seq num in pqact pattern
Change-Id: I08d858beeae7f0fb211a3cf287b7763aa2cff9b5

Former-commit-id: d59054c870fee17076aec22cd683ef1586a153da
2014-09-26 10:49:37 -04:00
David Friedman
c85b0d1cfd ASM #15551 - WarnGen: only WCN should be used while including TOR/SVR watches in WarnGen products
Change-Id: I1698025cad4310f8fc30938294c161c1f9797f03

Former-commit-id: 70b520c08670646047ffa753814f98c032938ff8
2014-09-26 13:07:28 +00:00
David Friedman
e82f96193e ASM #16783 - Warngen: Possible problem when there are two effective VTEC actions for a watch
Change-Id: I76599d23396fe64c9448440787e67d752ed6b028

Former-commit-id: 117c2f072b647e353456832f2f0088d51a660d65
2014-09-25 22:10:42 +00:00
David Friedman
8ab4649312 ASM #16773 - WarnGen can become disabled when a followup is selected
Change-Id: Ibe0e3b18914840515f8bc9d844a2ffb0a6abddf0

Former-commit-id: 5048af915b004067ec8a6e788a0e9ad3e006c9d8
2014-09-25 21:07:16 +00:00
Shawn.Hooper
831af82c23 ASM #600 - WarnGen: template optional watch inclusion
Change-Id: I282e94236389a907326926a68e2ed810a00b9688

Former-commit-id: 04bd69f437b897d63ac78d6cbd7c60451366cc6d
2014-09-25 16:25:43 -04:00
Qinglu.Lin
ef851d0016 ASM #15551 - WarnGen: only WCN should be used while including TOR/SVR watches in WarnGen products
Change-Id: I33fb6fab8d49aca4f12f76c763e5f3ddbd9272b5

Former-commit-id: 8b194664458246dad7509c44bcc07480cb088ddd
2014-09-25 15:16:42 -04:00
Matthew Howard
63a7fb0372 Merge "ASM #16693 updated dictionary cleanup script" into asm_14.3.1
Former-commit-id: bc9c9b073e69825d5e040e1cca2f738719a7e4f7
2014-09-25 14:14:40 -05:00