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 |
|
Brian.Dyke
|
9661a1d7b1
|
Merge branch 'asm_14.2.4' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.2.4
Former-commit-id: 0e0255ce5b [formerly 6e79993fbf34ebd832ca07356cbac003efaf6405]
Former-commit-id: 0c1b83b644
|
2014-09-29 11:55:16 -04:00 |
|
Sean.Webb
|
c679d1cc46
|
Merge "ASM #16720 - Added pushd and cd prior to patch extraction" into asm_14.2.4
Former-commit-id: 2d531d73fd [formerly c62a7e14e82c7274ed1868d73446aab895901546]
Former-commit-id: fbd892909b
|
2014-09-29 10:35:10 -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 |
|
Sean.Webb
|
224cddfe9b
|
ASM #16720 - Added pushd and cd prior to patch extraction
Change-Id: Iac7658d312721b1cc992a5c96a596120b6c5b225
Former-commit-id: 600b75bd9f [formerly c2af0284e9146dff8431ecd4f6ce88437ea83d9f]
Former-commit-id: 02e187a609
|
2014-09-29 10:24:04 -04:00 |
|
Sean.Webb
|
9b25583e3a
|
Merge "ASM #16720 - Removed extraneous popd which was changing dir when not needed" into asm_14.2.4
Former-commit-id: 6e1f0363c8 [formerly 8f44d89f1d11cd587106f7eda3edec93802f5cf3]
Former-commit-id: dc3ad9863d
|
2014-09-29 08:31:44 -05:00 |
|
Sean.Webb
|
6840d55343
|
ASM #16720 - Removed extraneous popd which was changing dir when not needed
Change-Id: I3c5521cfa0d0223cc8a6a3094d9efa7c6bf9f683
Former-commit-id: 78f83fa594 [formerly 4faea9724adf17d0bec7f013bafc7f8dd2f7499e]
Former-commit-id: 0738a41cbf
|
2014-09-29 08:21:00 -04:00 |
|
Brian.Dyke
|
8e459ec500
|
Merge branch 'asm_14.2.3' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.2.3
Former-commit-id: 142432ba5e [formerly 93ddf672c137c7221e9595e8b5c1b279084cb451]
Former-commit-id: 550ffba7b0
|
2014-09-26 16:14:06 -04:00 |
|
David Friedman
|
86100b6ca8
|
ASM #15658 - WarnGen: inclusion of watch information in marine products
Change-Id: I13d9e58b1df3dd434cdea66060dbc5886c0e27f2
Former-commit-id: 05707d0f20 [formerly 78cc67f9d2f86c2088ffc5695c4dea879a9e2ebb]
Former-commit-id: 6791e8d885
|
2014-09-26 20:05:46 +00: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
|
2495e16947
|
Merge branch 'asm_14.2.4' of winter:/data/gerrit2/git/AWIPS2_baseline into master_14.2.4
Former-commit-id: f1755fb7ae [formerly 4ff65f7c83042dd40b5c2bf37ee54d12315c5714]
Former-commit-id: 989a9c5835
|
2014-09-26 14:20:34 -04:00 |
|
Brian.Dyke
|
396f9755dc
|
Merge branch 'field_14.2.4' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.2.4
Former-commit-id: f26fe97ec4 [formerly 5b570e5229628de88068edee1c70c26eec13f71a]
Former-commit-id: 1ac61fb612
|
2014-09-26 14:19:03 -04:00 |
|
Sean.Webb
|
e8585c9d29
|
Merge "ASM #16720 - Added updated palt.c to fix seq num in pqact pattern" into asm_14.2.4
Former-commit-id: 57342f0256 [formerly d1ce11d690a1acf24fe82fc10acc83302e8f61f9]
Former-commit-id: 96503843d9
|
2014-09-26 11:01:04 -05: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 |
|
David Friedman
|
1737d16a5c
|
ASM #15551 - WarnGen: only WCN should be used while including TOR/SVR watches in WarnGen products
Change-Id: I8b8e9ae40596e5a3d5f0aa44d2e946aa7a68a1ae
Former-commit-id: db29ec9dec [formerly c8aa2fbfc35c872e2d50de2212eaf16db9b5483d]
Former-commit-id: 33aee54b8f
|
2014-09-26 15:13:56 +00:00 |
|
Sean.Webb
|
eb959d100a
|
ASM #16720 - Added updated palt.c to fix seq num in pqact pattern
Change-Id: I08d858beeae7f0fb211a3cf287b7763aa2cff9b5
Former-commit-id: 7d75d994c1 [formerly d59054c870fee17076aec22cd683ef1586a153da]
Former-commit-id: 628ab54d68
|
2014-09-26 10:49:37 -04:00 |
|
David Friedman
|
cfcfc17a2b
|
ASM #15551 - WarnGen: only WCN should be used while including TOR/SVR watches in WarnGen products
Change-Id: I1698025cad4310f8fc30938294c161c1f9797f03
Former-commit-id: c85b0d1cfd [formerly 70b520c08670646047ffa753814f98c032938ff8]
Former-commit-id: 41820f112f
|
2014-09-26 13:07:28 +00:00 |
|
David Friedman
|
c16f5c2e7c
|
ASM #16783 - Warngen: Possible problem when there are two effective VTEC actions for a watch
Change-Id: I76599d23396fe64c9448440787e67d752ed6b028
Former-commit-id: e82f96193e [formerly 117c2f072b647e353456832f2f0088d51a660d65]
Former-commit-id: 5755c120d5
|
2014-09-25 22:10:42 +00:00 |
|
David Friedman
|
973d0b9a55
|
ASM #16773 - WarnGen can become disabled when a followup is selected
Change-Id: Ibe0e3b18914840515f8bc9d844a2ffb0a6abddf0
Former-commit-id: 8ab4649312 [formerly 5048af915b004067ec8a6e788a0e9ad3e006c9d8]
Former-commit-id: b3025aacb0
|
2014-09-25 21:07:16 +00: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 |
|
Qinglu.Lin
|
1c55b5c400
|
ASM #15551 - WarnGen: only WCN should be used while including TOR/SVR watches in WarnGen products
Change-Id: I33fb6fab8d49aca4f12f76c763e5f3ddbd9272b5
Former-commit-id: ef851d0016 [formerly 8b194664458246dad7509c44bcc07480cb088ddd]
Former-commit-id: 94fed71091
|
2014-09-25 15:16:42 -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
|
e55855b4ff
|
VLab Issue #4794 - O&M RM16720; Update planesMenusPlanView.xml; fixes #4794
Change-Id: I8e4b7c563e74e18c3c60e858cd7e6bd3cdaff8e8
Former-commit-id: a72725f9ef [formerly 833cff4f37542078578de96b3b59723f77c31f4c]
Former-commit-id: d96f5fe229
|
2014-09-25 17:46:53 +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 |
|
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 |
|
Matthew Howard
|
80fd57e0b6
|
Merge "ASM #16755 - Checkin fix for MPE and Hydro perspectives for Mike Duff" into asm_14.2.3
Former-commit-id: df9b5f74c8 [formerly 0cfeb341bc827b707c932cd8ca2a1d8e5c1c8ad7]
Former-commit-id: e977069a71
|
2014-09-23 10:23:16 -05: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
|
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 |
|
Sean.Webb
|
fde36e7456
|
Merge "ASM #16761 - Fixed typo on variable character" into asm_14.2.3
Former-commit-id: 5dfd94a2dd [formerly 3592653ff850b2950d3ca4c0fead17292b58f971]
Former-commit-id: 4d2c798cc2
|
2014-09-22 14:23:18 -05:00 |
|
Sean.Webb
|
fb6e633cfc
|
Merge "ASM #16761 - Fixed typo on variable character" into asm_14.2.3
Former-commit-id: dd31b930b3 [formerly d5f0fa6d025ec11eb83b9ceceb8309a23f80820b]
Former-commit-id: 9b164205c0
|
2014-09-22 14:22:58 -05:00 |
|
Sean.Webb
|
be3bb99abe
|
ASM #16761 - Fixed typo on variable character
Change-Id: Iaab6df0c74bd1745d81717590d9980e1057ece37
Former-commit-id: a9dddb44ce [formerly 97a94d4b1d612ca0878defd3e3fcf2b7391e3b36]
Former-commit-id: 00479a436d
|
2014-09-22 14:10:28 -04: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 |
|
Sean.Webb
|
07589bbdda
|
ASM #16761 - Fixed typo on variable character
Change-Id: Ibb44f6b6f969a92780d28676db930420bc7446c2
Former-commit-id: 4c936b9bc8 [formerly 721bead655f9a384ea12444617774b7ef404feb0]
Former-commit-id: 47aef24f6f
|
2014-09-22 07:18:21 -04: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 |
|
Shawn Hooper
|
da5d9169ee
|
Merge changes Ia37804af,I1649c38e,I9dc84e7e,Ie9e2ab55 into asm_14.2.3
* changes:
ASM #16761 - Fixed typo on variable character
ASM #16761 - Added ldm dir removal to prevent conflicts if libs change
ASM #16761 - Added retrans code updates from ISG
ASM #16761 - Updated ldm spec to add retrans
Former-commit-id: ce704601ae [formerly fc69e9debbbad3f8b82a8670f700a158fb68c12b]
Former-commit-id: 2df3755d31
|
2014-09-19 14:05:35 -05: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 |
|
Sean.Webb
|
502f7520a7
|
ASM #16761 - Fixed typo on variable character
Change-Id: Ia37804afe2f77e17dd76fcc52b3a7ad4870e5275
Former-commit-id: e0abd14986 [formerly 5c541f50dcc68a856e8c81bff8577334abf1ff75]
Former-commit-id: 4368f4650b
|
2014-09-19 13:43:45 -04:00 |
|
Brian.Dyke
|
813d2be68e
|
Merge branch 'field_14.2.4' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.2.4
Former-commit-id: 9435507b27 [formerly aaae61509d743553186cdefdea0557158b139527]
Former-commit-id: 88d5f872ae
|
2014-09-19 13:14:13 -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 |
|
Ana Rivera
|
2a25376398
|
VLab Issue #4794 - RM 16720 Update LevelMappingFile.xml; fixes #4794
Change-Id: I58d0cb7e38d5ed483db5c87cc322c93764e21f06
Former-commit-id: 56f409717f [formerly 3af534fb2778268fee650c09c5aa0346df746ce8]
Former-commit-id: 9d8c08a09a
|
2014-09-19 15:17:46 +00:00 |
|
Sean.Webb
|
c90c45f303
|
ASM #16761 - Added ldm dir removal to prevent conflicts if libs change
Change-Id: I1649c38e1aa9460f373d4500795a06cc849dd09b
Former-commit-id: 6ffb17540e [formerly 031c41d4f7801c8a5127cf007358856bf771593a]
Former-commit-id: b0b01694f7
|
2014-09-19 09:29:31 -04:00 |
|
Sean.Webb
|
7f898635f9
|
ASM #16761 - Added retrans code updates from ISG
Change-Id: I9dc84e7ee45242f74f9676a8d265eba81af6a08c
Former-commit-id: 51380a2363 [formerly 165b9a9b3481b3fa1d31b771eead03180430be59]
Former-commit-id: 5c84cadaf6
|
2014-09-19 07:25:18 -04:00 |
|
Brian.Dyke
|
e70a9db68c
|
Merge branch 'ohd_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: 8b0603cdb8 [formerly de22db308f36c42d5c7e0989dbd7decfaaf3adbb]
Former-commit-id: c6b0adfc53
|
2014-09-18 12:43:01 -04:00 |
|
Chip Gobs
|
0e4b8d2e9b
|
VLab Issue #4611
Adding missing changed file.
Change-Id: Ifcc56c121bb13806a5a5e7fc4e6de6e36900867e
Former-commit-id: 31efce6b8f [formerly e68f56628f035ca2a20848a0e76f6efa8bbe1e8a]
Former-commit-id: 0d046a56e8
|
2014-09-18 12:12:42 -04:00 |
|
Matthew Howard
|
f3764d3bd3
|
Merge "ASM #15465 - No variable for failed site's MND Header location available for WarnGen to use" into asm_14.3.1
Former-commit-id: 0d0aae9234 [formerly 0b0c2e1ea8188cd88c92fde4d4b999670aad17dc]
Former-commit-id: 27c31ea90f
|
2014-09-18 10:36:17 -05:00 |
|