Commit graph

2919 commits

Author SHA1 Message Date
Shawn.Hooper
700bc0691c ASM #13467 - Update GenericHazards.py for Shannon
Change-Id: Ic1131929aa14f97cff0e1cf92e30c338470f368e

Former-commit-id: ddeec493c3 [formerly f4e8f7493bbfb025e8040f7663dc582414a87413]
Former-commit-id: 4d81023184
2014-10-21 11:11:34 -04:00
Brian.Dyke
498abd3716 Merge branch 'asm_14.3.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.3.1
Former-commit-id: 93df82ac92 [formerly f0f79fb324665245ef759947d24514a6c8bc4470]
Former-commit-id: 418894a17b
2014-10-16 12:04:27 -04:00
Shawn.Hooper
ee70a6a4bd ASM #13467 - Fix for GFE: Need to add Beach Hazards Statement
Change-Id: I9d19a76afff8e4c36db20aec15b997eefc260209

Former-commit-id: 118f34bbf1 [formerly 366c7c478c6d83f8d21e3b30cc664a32cabf08bd]
Former-commit-id: eafaf01966
2014-10-16 11:30:29 -04:00
Brian.Dyke
7f719d0124 Merge branch 'mdl_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: 0d5f2c0add [formerly ea0a81b12c7b1a0154361d97882ef65fc55b20e1]
Former-commit-id: c60124fa61
2014-10-16 11:21:39 -04:00
Juliya Dynina
6beb107913 Merge "ASM #258 - cross section - switching the log plot to z-coordinate scale" into asm_14.3.1
Former-commit-id: 32b7e80d82 [formerly 5a639cc5850b906df927db1069bcf60cd68f15ab]
Former-commit-id: 33e30cab01
2014-10-10 14:43:13 -05:00
Shawn.Hooper
bfa9eb0dea ASM #13467 - GFE: Need to add Beach Hazards Statement
Change-Id: Icd52e8f1cd05f1f1ecd0b43458593e95496e0db6

Former-commit-id: 0c61661989 [formerly 457c467d7437c5550bb8727e813d8aa9d9c338a9]
Former-commit-id: cea5061c61
2014-10-10 13:14:25 -04:00
David Friedman
676ee09f11 ASM #258 - cross section - switching the log plot to z-coordinate scale
Change-Id: Ie2fd21c0b65d17f778d69daf7120e47a6f4e552a

Former-commit-id: ad73a90b53 [formerly f187f262a28e0ee9df2b75eff7d1f5382a729ac3]
Former-commit-id: 40f7e8df44
2014-10-10 14:18:54 +00:00
Juliya Dynina
1fb3bdb8a1 Merge "ASM #556 - WarnGen: use noon/midnight instead of 1200 PM/1200 AM" into asm_14.3.1
Former-commit-id: 4911f61f10 [formerly 7a0da7440a3e5e1696cc676dc3405d2aaa95252b]
Former-commit-id: 240917cf96
2014-10-08 12:00:39 -05:00
Sean Webb
c90be3ba42 Merge "ASM #15672 - fixed script to allow for full path of input file to be passed" into asm_14.3.1
Former-commit-id: 01b52daea2 [formerly 986a78cef3d8814e04035b00545a289171c7cc8a]
Former-commit-id: c3f3140c4f
2014-10-07 14:04:58 -05:00
Kevin.Johnson
dcecf025a2 ASM #15672 - fixed script to allow for full path of input file to be passed
Change-Id: Id4d9b71aaa8fb5ba26f5fc940e43ad149305cbae

Former-commit-id: 5cf5cac9f7 [formerly 0982ab6536679921a6afdc85166fe57e92aeac63]
Former-commit-id: 355274e7ac
2014-10-07 14:55:41 -04:00
Qinglu.Lin
8372c15a61 ASM #556 - WarnGen: use noon/midnight instead of 1200 PM/1200 AM
Change-Id: I2a64416b861d3b374538db8efad51a9509a87892

Former-commit-id: 47be3aa143 [formerly 7124fd252f130417a9dcdac148480058d6eb0aba]
Former-commit-id: 636f054077
2014-10-06 16:05:26 -04:00
Darrel Kingfield
66dcc60acf VLab Issue #4922 - Rotation Tracks patch check-in
Former-commit-id: aa168071aa [formerly 48565726c39ea8139d4a3dfd505732cee2d32b16]
Former-commit-id: 8113b2ba69
2014-10-06 10:01:36 -05:00
Brian.Dyke
85d83aefe0 Merge branch 'omaha_14.3.1' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.3.1
Former-commit-id: 92762f46c7 [formerly 23d16004c389f0ef708bee2a8bfb84d465b7b36b]
Former-commit-id: f440da9c70
2014-10-03 14:04:46 -04:00
Brian.Dyke
db665d3876 Merge branch 'asm_14.3.1' of winter:/data/gerrit2/git/AWIPS2_baseline into master_14.3.1
Former-commit-id: 20dd249d2c [formerly 441fc7561a8526422f9b73b9c47cd220f0babb54]
Former-commit-id: 2a911984f0
2014-10-02 10:44:50 -04:00
Brian.Dyke
006bdb00ad Merge branch 'mdl_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: f3f95aabb0 [formerly 8fa6749e28cb247ae63307f1423351c23ec0eb87]
Former-commit-id: 65ad6056b6
2014-10-02 10:38:51 -04:00
Brian.Dyke
d4888adc0f 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 ece734cb6218a80fa2dda1b3c43673dc5a31bfbb]
Former-commit-id: f47840e4d9
2014-10-02 10:24:04 -04:00
Brian.Dyke
31f073ee3a Merge branch 'ops_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: 97464ea153 [formerly f26e54011d334972bb1e999304b1b2d13a1c408f]
Former-commit-id: 4bc465bfbd
2014-10-02 10:15:34 -04:00
Steve Harris
09d8955b31 Merge branch 'master_14.3.1' (14.3.1-23) into omaha_14.3.1
Former-commit-id: cc34483b0b [formerly ace8473f96c6151918ee8ecf61e3b8986d98a68a]
Former-commit-id: e201e1a493
2014-10-02 08:09:02 -05:00
Shawn.Hooper
22c3fde0ef ASM #15033 - Fix IBW templates and 14.2.1 template corrections
Change-Id: I2677b93f897640318d8f89da72e49ba398d1d720

Former-commit-id: ae02cbc2da [formerly ea8e4c3a30bceb2f3b53159317382ae651aa5531]
Former-commit-id: f9428ace1f
2014-10-01 15:58:48 -04:00
Brian.Dyke
0be927be2d Merge branch 'master_14.3.1' into asm_14.3.1
Former-commit-id: a4bfbea3c2 [formerly 622e63224b6d6bf1d6ced874658bbd9db381799b]
Former-commit-id: 5ed17c0e24
2014-10-01 15:36:06 -04:00
dmsys
f704781f4f 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: 9f4560c480 [formerly 0bf7ecb27d41f81f1d6727674fc1475eeaa8512c]
Former-commit-id: 8c3625cfec
2014-09-30 13:45:54 -04:00
Steve Harris
fdfe16985d Merge branch 'master_14.3.1' (14.3.1-21,22) into omaha_14.3.1
Former-commit-id: c03bc273da [formerly 49ad8e0e780443a0439227694a92ec8ab683b125]
Former-commit-id: 46da726675
2014-09-29 11:14:32 -05:00
Brian.Dyke
fce029653d Merge branch 'master_14.2.3' into master_14.2.4
Former-commit-id: 46af1d0857 [formerly 01cb1dc674ae1249d97dc10be5c068de0ed2a222]
Former-commit-id: 0a497fc015
2014-09-29 11:20:57 -04:00
Brian.Dyke
858cfa1078 Merge branch 'omaha_14.2.4' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.2.4
Former-commit-id: 814b9a2869 [formerly 60756ddb841a0daa347493047b76d2fcb93f7f4a]
Former-commit-id: 41921f7db2
2014-09-26 15:15:57 -04:00
Brian.Dyke
f520ff97b6 Merge branch 'master_14.3.1' into asm_14.3.1
Former-commit-id: a4f68caac6 [formerly 6ed90023551e25216c10d05f2568593992326900]
Former-commit-id: 8245370186
2014-09-26 13:02:49 -04:00
Brian.Dyke
0045c3100f Merge branch 'omaha_14.2.3' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.2.3
Former-commit-id: bd983e1932 [formerly d6369c8346d1ed4d86ed3eb7adc47de0891c7fd7]
Former-commit-id: 586a504500
2014-09-26 11:47:38 -04:00
Shawn.Hooper
56cd6483ef ASM #600 - WarnGen: template optional watch inclusion
Change-Id: I282e94236389a907326926a68e2ed810a00b9688

Former-commit-id: 831af82c23 [formerly 04bd69f437b897d63ac78d6cbd7c60451366cc6d]
Former-commit-id: da77322fd0
2014-09-25 16:25:43 -04:00
Ron Anderson
df1d9f8b72 Issue #3648 Fix GridParmManager.d2dGridDataPurged() to use deallocateDb.
Change-Id: Id9bb73c54028615c33a61373d7b565a230867c1a

Former-commit-id: 34df50963e [formerly 8c177752b8e2baa2e739fc69320c4e4b31d972c7]
Former-commit-id: 7020daa55a
2014-09-25 13:48:11 -05:00
Ana Rivera
043ec96c2d VLab Issue #4836 - O&M RM14013; Update aKrtmaNDFD.xml; fixes #4836
Change-Id: I18d92482782e4c95cdd147d1edb1f65f3865b98f

Former-commit-id: c1b58f214f [formerly cf3d9a81a52c19977371e3abee755d1c239b1f8a]
Former-commit-id: 39fc13eb38
2014-09-25 18:18:21 +00:00
Kevin.Johnson
7d677d0023 ASM #15672 - Added initial field tested version of edexOsgi/com.raytheon.uf.tools.cli/impl/check_baseline_changes.sh
Change-Id: Ibbd6bcb2fb36c02418fb612436d7db5ba9f571a7

Former-commit-id: 4d8efeeb9a [formerly c36b732cc8057cf7b830de647998f679725760da]
Former-commit-id: 5a38528711
2014-09-25 10:50:07 -04:00
Baoyu Yin
e9e3ad94ab VLab Issue #4553 - AWIPS2_DR_16047: An update for Bad rule in gridImageryStyleRules.xml for Convective Inhibition; fixes #4553
Change-Id: Ib4e566154c6b8282efb33464b850ff1f66a5e6d0

Former-commit-id: c9385c0912 [formerly 847ecb836cf5d7bad28817dd68e752e4ba79f6c4]
Former-commit-id: dea223412e
2014-09-25 09:44:21 -04:00
Ana Rivera
bb533d9ddd VLab Issue #4669 - Add Beach Hazards Statement (RM 13467); fixes #4669
Change-Id: I54c1055b87b7bfab0a35fd391c6ef7156fc3d297

Former-commit-id: 9a0e9b17f4 [formerly 2c16492202230dcbec93cf390b47f400a77a545e]
Former-commit-id: 535f254357
2014-09-24 20:11:29 +00:00
Benjamin Phillippe
c7d6c602bd Issue #3560 Fixed slow memory leak in registry
Former-commit-id: 81870960e6 [formerly 918119b26864ee246ac2571baa4e380ae21f2ded]
Former-commit-id: fb8dc9fe7d
2014-09-24 14:36:34 -05:00
Brian.Dyke
b49b13f77e Merge branch 'master_14.2.4' into master_14.3.1 CM-MERGE:14.2.4-10-11-12 into 14.3.1
Conflicts:
	cave/com.raytheon.viz.grid/localization/volumebrowser/FieldDisplayTypes.xml
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
	ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/GRID/HRRR/HRRR.xml
	ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/ResourceFilters.xml

Former-commit-id: 87fa32d2d4 [formerly e04ad21771ce410beb25e15fe300a34796a1a062]
Former-commit-id: 4b418918d4
2014-09-24 11:05:37 -04:00
Slav Korolev
4c209b4958 Issue #2757 - Fixed problem with adding and removing zones.
Former-commit-id: a4914bd85d [formerly 31ccaf218df628327fe4b27d69a4500eb1dc8d84]
Former-commit-id: 443c7c7482
2014-09-24 09:34:43 -04:00
Ron Anderson
8d0d43a437 Issue #3648 Improve GFE error handling for getAllAvailableParms.
Change-Id: I13d41a3c231a56fe7d6fc4bc3cbfd96e1bdcdccf

Former-commit-id: c37618c16c [formerly b77b3c916b4dcc9034408220006f941cd301ed3c]
Former-commit-id: 429de3224f
2014-09-23 18:47:38 -05:00
Ron Anderson
b0bb1aba4b Issue #3648 Change GFE version purging to be event driven.
Change-Id: I204a37535464d6d04dddd0614716dfe8f51ef40e

Former-commit-id: 580db71dc8 [formerly ad725686f80a1f67ca6865859ad4f072edd1c54f]
Former-commit-id: 25a41ff9db
2014-09-23 13:43:14 -05:00
David Friedman
0ed1ce5726 ASM #15658 - WarnGen: inclusion of watch information in marine products
Change-Id: I545d1b07444c9ca00ea2e95c4ccaed79946bbead

Former-commit-id: 2ee1ebe72d [formerly e0f6cc70bf5258d66bfa8a4ddb1daf871b6c92c5]
Former-commit-id: a6acf71a0a
2014-09-23 18:39:22 +00:00
Shawn.Hooper
77b4daa18e ASM #16755 - Checkin fix for MPE and Hydro perspectives for Mike Duff
Change-Id: Ibd5d2caad16de2ab2a645b507c0e00bea61e9d5e

Former-commit-id: 94b3acd437 [formerly 4ddd428c4168eb90b6d9b01db2e0bdd02206a9e7]
Former-commit-id: 99f6ff6d0a
2014-09-23 10:44:38 -04:00
Steve Harris
fa6f4c608d Merge branch 'master_14.3.1' (14.3.1-20) into omaha_14.3.1
Former-commit-id: 00eda3f982 [formerly 68ff0acbe3739e2fd3aa89b13ed070c39db48551]
Former-commit-id: 3301300c7e
2014-09-22 22:18:26 -05:00
Steve Harris
7aa6719ca2 Merge branch 'master_14.2.4' (14.2.4-12) into omaha_14.2.4
Former-commit-id: b1931ae7dc [formerly 9bc599dd5481360d7a00b9c8455805893922127d]
Former-commit-id: 38daf108e6
2014-09-22 22:06:05 -05:00
Ron Anderson
12dbec98fd Issue #3526 Fix errors found during testing in SS
Change-Id: Ic2a7f0b38f57fcae6b3fea904a457642472b2157

Former-commit-id: ba501a4210 [formerly 0e3e60bcc4b8adcb9efa51df28d4b35bb6228ed7]
Former-commit-id: 5407eb6a71
2014-09-22 11:34:31 -05:00
Brian.Dyke
b94198ffb3 Merge branch 'ops_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: 1018c65552 [formerly 41a854146a3f4ab156b63e2ea24e60681fc586f2]
Former-commit-id: c0dc990974
2014-09-19 16:59:12 -04:00
Brian.Dyke
75f3bb31d5 Merge branch 'asm_14.3.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.3.1
Former-commit-id: 8d665b93b5 [formerly 8d5d8cdfd272f8000a6a21a4128998889eb2ab30]
Former-commit-id: 4db67c581c
2014-09-19 16:56:50 -04:00
Baoyu Yin
957c12653b VLab Issue #4796 - AWIPS2_DR_17420 WarnGen IBW templates and 14.2.1 template corrections; fixes #4796
Change-Id: Ieb4a6d68b48351deacbddda65f1ff53485c3402d

Former-commit-id: 28b7e8d6e2 [formerly f077d3cd4084faf8ad7c8865e84df53e59a5db72]
Former-commit-id: 8568cd8419
2014-09-19 15:02:23 -04:00
Brian.Dyke
9fc3eb20c1 Merge branch 'ncep_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: 9c33ae6d2c [formerly e895f7927a95c2416c05953e131d9e0c6095beb3]
Former-commit-id: 6ad8d500ef
2014-09-19 14:42:29 -04:00
Brian.Dyke
279f67ff54 Merge branch 'master_14.2.3' into master_14.2.4
Former-commit-id: e601d3fa51 [formerly 88e26cd8b378ffc81db87aee226ceca47ae58aa7]
Former-commit-id: 7f49052445
2014-09-19 13:08:06 -04:00
Darrel Kingfield
3eeaa8f359 VLab Issue #4603 - MRMS SBN Display initial code check-in v3 - update purge rules; fixes #4603
Change-Id: Ic38722b3080edc3f9a9f8d35d4b2271d34b63872

Former-commit-id: 88a8dddef3 [formerly a9bc901ed4b9157a4cb1a042d5fabe628cfd4b2a]
Former-commit-id: 1cabae50b1
2014-09-19 11:14:09 -05:00
Steve Harris
0ef8105b04 Merge branch 'master_14.3.1' (14.3.1-19) into omaha_14.3.1
Former-commit-id: fbab75af66 [formerly c72e05b87f6eb6d094bde5e7caec3cccb20476ce]
Former-commit-id: 07a7645fcd
2014-09-19 11:13:46 -05:00
Brian.Dyke
1c0d6624a3 Merge branch 'ops_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: 57a361073d [formerly 5703d4fbb0fa5e422e3fbd62529928091a2bdb1f]
Former-commit-id: e1c88f287a
2014-09-17 15:50:13 -04:00