Brian.Dyke
|
65ad6056b6
|
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
|
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
|
4bc465bfbd
|
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 |
|
dmsys
|
8c3625cfec
|
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 |
|
Brian.Dyke
|
0c1b83b644
|
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
|
fbd892909b
|
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
|
0a497fc015
|
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
|
02e187a609
|
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
|
dc3ad9863d
|
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
|
0738a41cbf
|
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
|
550ffba7b0
|
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
|
6791e8d885
|
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
|
41921f7db2
|
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
|
989a9c5835
|
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
|
1ac61fb612
|
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 |
|
Sean.Webb
|
96503843d9
|
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
|
586a504500
|
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
|
33aee54b8f
|
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
|
628ab54d68
|
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
|
41820f112f
|
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
|
5755c120d5
|
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
|
b3025aacb0
|
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
|
da77322fd0
|
ASM #600 - WarnGen: template optional watch inclusion
Change-Id: I282e94236389a907326926a68e2ed810a00b9688
Former-commit-id: 04bd69f437b897d63ac78d6cbd7c60451366cc6d
|
2014-09-25 16:25:43 -04:00 |
|
Qinglu.Lin
|
94fed71091
|
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 |
|
Ron Anderson
|
7020daa55a
|
Issue #3648 Fix GridParmManager.d2dGridDataPurged() to use deallocateDb.
Change-Id: Id9bb73c54028615c33a61373d7b565a230867c1a
Former-commit-id: 8c177752b8e2baa2e739fc69320c4e4b31d972c7
|
2014-09-25 13:48:11 -05:00 |
|
Ana Rivera
|
39fc13eb38
|
VLab Issue #4836 - O&M RM14013; Update aKrtmaNDFD.xml; fixes #4836
Change-Id: I18d92482782e4c95cdd147d1edb1f65f3865b98f
Former-commit-id: cf3d9a81a52c19977371e3abee755d1c239b1f8a
|
2014-09-25 18:18:21 +00:00 |
|
Ana Rivera
|
d96f5fe229
|
VLab Issue #4794 - O&M RM16720; Update planesMenusPlanView.xml; fixes #4794
Change-Id: I8e4b7c563e74e18c3c60e858cd7e6bd3cdaff8e8
Former-commit-id: 833cff4f37542078578de96b3b59723f77c31f4c
|
2014-09-25 17:46:53 +00:00 |
|
Baoyu Yin
|
dea223412e
|
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: 847ecb836cf5d7bad28817dd68e752e4ba79f6c4
|
2014-09-25 09:44:21 -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 |
|
Benjamin Phillippe
|
fb8dc9fe7d
|
Issue #3560 Fixed slow memory leak in registry
Former-commit-id: 918119b26864ee246ac2571baa4e380ae21f2ded
|
2014-09-24 14:36:34 -05:00 |
|
Brian.Dyke
|
4b418918d4
|
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: e04ad21771ce410beb25e15fe300a34796a1a062
|
2014-09-24 11:05:37 -04:00 |
|
Ron Anderson
|
429de3224f
|
Issue #3648 Improve GFE error handling for getAllAvailableParms.
Change-Id: I13d41a3c231a56fe7d6fc4bc3cbfd96e1bdcdccf
Former-commit-id: b77b3c916b4dcc9034408220006f941cd301ed3c
|
2014-09-23 18:47:38 -05:00 |
|
Ron Anderson
|
25a41ff9db
|
Issue #3648 Change GFE version purging to be event driven.
Change-Id: I204a37535464d6d04dddd0614716dfe8f51ef40e
Former-commit-id: ad725686f80a1f67ca6865859ad4f072edd1c54f
|
2014-09-23 13:43:14 -05:00 |
|
David Friedman
|
a6acf71a0a
|
ASM #15658 - WarnGen: inclusion of watch information in marine products
Change-Id: I545d1b07444c9ca00ea2e95c4ccaed79946bbead
Former-commit-id: e0f6cc70bf5258d66bfa8a4ddb1daf871b6c92c5
|
2014-09-23 18:39:22 +00:00 |
|
Matthew Howard
|
e977069a71
|
Merge "ASM #16755 - Checkin fix for MPE and Hydro perspectives for Mike Duff" into asm_14.2.3
Former-commit-id: 0cfeb341bc827b707c932cd8ca2a1d8e5c1c8ad7
|
2014-09-23 10:23:16 -05:00 |
|
Shawn.Hooper
|
99f6ff6d0a
|
ASM #16755 - Checkin fix for MPE and Hydro perspectives for Mike Duff
Change-Id: Ibd5d2caad16de2ab2a645b507c0e00bea61e9d5e
Former-commit-id: 4ddd428c4168eb90b6d9b01db2e0bdd02206a9e7
|
2014-09-23 10:44:38 -04:00 |
|
Steve Harris
|
38daf108e6
|
Merge branch 'master_14.2.4' (14.2.4-12) into omaha_14.2.4
Former-commit-id: 9bc599dd5481360d7a00b9c8455805893922127d
|
2014-09-22 22:06:05 -05:00 |
|
Sean.Webb
|
4d2c798cc2
|
Merge "ASM #16761 - Fixed typo on variable character" into asm_14.2.3
Former-commit-id: 3592653ff850b2950d3ca4c0fead17292b58f971
|
2014-09-22 14:23:18 -05:00 |
|
Sean.Webb
|
9b164205c0
|
Merge "ASM #16761 - Fixed typo on variable character" into asm_14.2.3
Former-commit-id: d5f0fa6d025ec11eb83b9ceceb8309a23f80820b
|
2014-09-22 14:22:58 -05:00 |
|
Sean.Webb
|
00479a436d
|
ASM #16761 - Fixed typo on variable character
Change-Id: Iaab6df0c74bd1745d81717590d9980e1057ece37
Former-commit-id: 97a94d4b1d612ca0878defd3e3fcf2b7391e3b36
|
2014-09-22 14:10:28 -04:00 |
|
Ron Anderson
|
5407eb6a71
|
Issue #3526 Fix errors found during testing in SS
Change-Id: Ic2a7f0b38f57fcae6b3fea904a457642472b2157
Former-commit-id: 0e3e60bcc4b8adcb9efa51df28d4b35bb6228ed7
|
2014-09-22 11:34:31 -05:00 |
|
Sean.Webb
|
47aef24f6f
|
ASM #16761 - Fixed typo on variable character
Change-Id: Ibb44f6b6f969a92780d28676db930420bc7446c2
Former-commit-id: 721bead655f9a384ea12444617774b7ef404feb0
|
2014-09-22 07:18:21 -04:00 |
|
Brian.Dyke
|
c0dc990974
|
Merge branch 'ops_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: 41a854146a3f4ab156b63e2ea24e60681fc586f2
|
2014-09-19 16:59:12 -04:00 |
|
Brian.Dyke
|
4db67c581c
|
Merge branch 'asm_14.3.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.3.1
Former-commit-id: 8d5d8cdfd272f8000a6a21a4128998889eb2ab30
|
2014-09-19 16:56:50 -04:00 |
|
Shawn Hooper
|
2df3755d31
|
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: fc69e9debbbad3f8b82a8670f700a158fb68c12b
|
2014-09-19 14:05:35 -05:00 |
|
Baoyu Yin
|
8568cd8419
|
VLab Issue #4796 - AWIPS2_DR_17420 WarnGen IBW templates and 14.2.1 template corrections; fixes #4796
Change-Id: Ieb4a6d68b48351deacbddda65f1ff53485c3402d
Former-commit-id: f077d3cd4084faf8ad7c8865e84df53e59a5db72
|
2014-09-19 15:02:23 -04:00 |
|
Brian.Dyke
|
6ad8d500ef
|
Merge branch 'ncep_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: e895f7927a95c2416c05953e131d9e0c6095beb3
|
2014-09-19 14:42:29 -04:00 |
|
Sean.Webb
|
4368f4650b
|
ASM #16761 - Fixed typo on variable character
Change-Id: Ia37804afe2f77e17dd76fcc52b3a7ad4870e5275
Former-commit-id: 5c541f50dcc68a856e8c81bff8577334abf1ff75
|
2014-09-19 13:43:45 -04:00 |
|
Brian.Dyke
|
88d5f872ae
|
Merge branch 'field_14.2.4' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.2.4
Former-commit-id: aaae61509d743553186cdefdea0557158b139527
|
2014-09-19 13:14:13 -04:00 |
|
Brian.Dyke
|
7f49052445
|
Merge branch 'master_14.2.3' into master_14.2.4
Former-commit-id: 88e26cd8b378ffc81db87aee226ceca47ae58aa7
|
2014-09-19 13:08:06 -04:00 |
|