Steve Harris
3598e9b5b6
Merge branch 'master_14.3.1' (14.3.1-22m) into omaha_14.4.1
...
Conflicts:
cave/com.raytheon.viz.volumebrowser/localization/menus/xml/fieldsMenus.xml
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/ohdlib/GagePP.java
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/T.xml
edexOsgi/com.raytheon.uf.tools.cli/impl/src/textdb/TextDB.py
Former-commit-id: 3b6a8a144790e08b96e1
2014-09-29 12:58:56 -05:00
Nate Jensen
c75ff5530d
Omaha #2975 optimize lookup of edit areas and gfe configs
...
Change-Id: Ic89c84e79a27476ebb28573d49f60429424d4c37
Former-commit-id: c3648d19891b70e053a1
2014-09-29 12:29:25 -05:00
Ben Steffensmeier
b333960362
Issue #3669 Ensure best res does not parse alert messages.
...
Former-commit-id: 95b096192bc573db2918
2014-09-29 11:20:33 -05:00
Steve Harris
fdfe16985d
Merge branch 'master_14.3.1' (14.3.1-21,22) into omaha_14.3.1
...
Former-commit-id: c03bc273da46da726675
2014-09-29 11:14:32 -05: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: 0e0255ce5b0c1b83b644
2014-09-29 11:55:16 -04:00
Ben Steffensmeier
6090625040
Omaha #3132 - merge master_14.3.1 into omaha_14.4.1
...
Former-commit-id: 5b10ac2f36f92d021e96
2014-09-29 10:49:14 -05:00
Sean.Webb
c679d1cc46
Merge "ASM #16720 - Added pushd and cd prior to patch extraction" into asm_14.2.4
...
Former-commit-id: 2d531d73fdfbd892909b
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: 46af1d08570a497fc015
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: 600b75bd9f02e187a609
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: 6e1f0363c8dc3ad9863d
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: 78f83fa5940738a41cbf
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: 142432ba5e550ffba7b0
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: 05707d0f206791e8d885
2014-09-26 20:05:46 +00:00
Mark Peters
5fb76a1532
Omaha #3629 Move datatype specific code from edex.decodertools to the specific datatype edex plugins
...
Change-Id: I6b66103ef55107df78fdbb047dfb8c743deaf2d4
Former-commit-id: 0c657c2a49549cf2a2b1
2014-09-26 14:50:03 -05: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: 814b9a286941921f7db2
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: f1755fb7ae989a9c5835
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: f26fe97ec41ac61fb612
2014-09-26 14:19:03 -04:00
Brian.Dyke
f520ff97b6
Merge branch 'master_14.3.1' into asm_14.3.1
...
Former-commit-id: a4f68caac68245370186
2014-09-26 13:02:49 -04:00
Richard Peter
5b023b628e
Merge "Omaha #3622 Fix duplicate SiteActivationNotifications. Check in the rest of the changes I missed the first time." into omaha_14.4.1
...
Former-commit-id: 1656522716941305b33d
2014-09-26 11:44:41 -05:00
Ron Anderson
e2d5bfa0b6
Omaha #3622 Fix duplicate SiteActivationNotifications.
...
Check in the rest of the changes I missed the first time.
Change-Id: I8640f8f09aeb6019374a857daf335b27c69e0880
Former-commit-id: 43d3aca5eab032f7f24e
2014-09-26 11:39:06 -05:00
Richard Peter
c9c4dda54c
Merge "Omaha #3622 Fix duplicate SiteActivationNotifications." into omaha_14.4.1
...
Former-commit-id: 23747ad042a4668b64a6
2014-09-26 11:27:53 -05: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: 57342f025696503843d9
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: bd983e1932586a504500
2014-09-26 11:47:38 -04:00
Ron Anderson
71aad3ecff
Omaha #3622 Fix duplicate SiteActivationNotifications.
...
Change-Id: I647bf118f558721867722cfc13d889e637237911
Former-commit-id: dd4f22789a92575e8db3
2014-09-26 15:19:08 +00: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: db29ec9dec33aee54b8f
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: 7d75d994c1628ab54d68
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: c85b0d1cfd41820f112f
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: e82f96193e5755c120d5
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: 8ab4649312b3025aacb0
2014-09-25 21:07:16 +00:00
Shawn.Hooper
56cd6483ef
ASM #600 - WarnGen: template optional watch inclusion
...
Change-Id: I282e94236389a907326926a68e2ed810a00b9688
Former-commit-id: 831af82c23da77322fd0
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: ef851d001694fed71091
2014-09-25 15:16:42 -04:00
Matthew Howard
8ec2860888
Merge "ASM #16693 updated dictionary cleanup script" into asm_14.3.1
...
Former-commit-id: 63a7fb03727d93a588f4
2014-09-25 14:14:40 -05:00
Matthew Howard
c88a228356
Merge "ASM #16693 Fix spelling checker swear words" into asm_14.3.1
...
Former-commit-id: aaf48f3dfe128518c4d7
2014-09-25 14:14:24 -05:00
Ron Anderson
df1d9f8b72
Issue #3648 Fix GridParmManager.d2dGridDataPurged() to use deallocateDb.
...
Change-Id: Id9bb73c54028615c33a61373d7b565a230867c1a
Former-commit-id: 34df50963e7020daa55a
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: c1b58f214f39fc13eb38
2014-09-25 18:18:21 +00:00
Ana Rivera
e55855b4ff
VLab Issue #4794 - O&M RM16720; Update planesMenusPlanView.xml; fixes #4794
...
Change-Id: I8e4b7c563e74e18c3c60e858cd7e6bd3cdaff8e8
Former-commit-id: a72725f9efd96f5fe229
2014-09-25 17:46:53 +00:00
Nate Jensen
1ec55dfc22
Omaha #3571 better error handling of invalid geom with map caching
...
Change-Id: I3947613aab5a7789b32ea1d0e3a8e3091d9690d8
Former-commit-id: 987060f56cc0b7fc0ac7
2014-09-25 11:30:27 -05: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: 4d8efeeb9a5a38528711
2014-09-25 10:50:07 -04:00
Nate Jensen
e74bfdc195
Merge "Omaha #3220 - Changes in the area configuration files for FSSObs monitors." into omaha_14.4.1
...
Former-commit-id: 174b036c56364aff9278
2014-09-25 08:44:50 -05: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: c9385c0912dea223412e
2014-09-25 09:44:21 -04:00
Slav Korolev
1120f9a440
Omaha #3220 - Changes in the area configuration files for FSSObs monitors.
...
Former-commit-id: ce2ef5019b7b1a4c6774
2014-09-25 09:02:27 -04:00
Lee Venable
1d52729e38
Merge "Issue #2757 - Fixed problem with adding and removing zones." into omaha_14.3.1
...
Former-commit-id: 5efe3232a777afac746c
2014-09-24 16:23:23 -05:00
Nate Jensen
86b76b399d
Omaha #3663 move airep and pirep plguins to ncep features
...
Change-Id: I2c9a274ee85b24e93800fa7c0f73739030995219
Former-commit-id: 36556fc48b4cf93c0acb
2014-09-24 15:20:17 -05:00
Ana Rivera
bb533d9ddd
VLab Issue #4669 - Add Beach Hazards Statement (RM 13467); fixes #4669
...
Change-Id: I54c1055b87b7bfab0a35fd391c6ef7156fc3d297
Former-commit-id: 9a0e9b17f4535f254357
2014-09-24 20:11:29 +00:00
Benjamin Phillippe
c7d6c602bd
Issue #3560 Fixed slow memory leak in registry
...
Former-commit-id: 81870960e6fb8dc9fe7d
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: 87fa32d2d44b418918d4
2014-09-24 11:05:37 -04:00
Ron Anderson
1b011f4577
Issue #2729 Revert changes made to PythonPreferenceStore.java in favor changes to GfePyIncludeUtil.java made in #3500 .
...
This reverts commit bd7e41165311c85298622abfe6de7761baeb4bccb1fa793541
2014-09-24 09:17:43 -05:00
Slav Korolev
4c209b4958
Issue #2757 - Fixed problem with adding and removing zones.
...
Former-commit-id: a4914bd85d443c7c7482
2014-09-24 09:34:43 -04:00
Ying-Lian.Shi
8533354024
ASM #16693 updated dictionary cleanup script
...
Change-Id: I431226edf9afdf2f85811e36a631926a37398203
Former-commit-id: b6ed9507e587911e9c4a
2014-09-24 12:30:40 +00:00
Ying-Lian.Shi
8eb9aac0b9
ASM #16693 Fix spelling checker swear words
...
Change-Id: I0a31429fa35a5c5a8f4d2f000021db4e4304de9e
Former-commit-id: 12c545ef7a2a38e3eca5
2014-09-24 12:08:43 +00:00
