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
Mark Peters
549cf2a2b1
Omaha #3629 Move datatype specific code from edex.decodertools to the specific datatype edex plugins
...
Change-Id: I6b66103ef55107df78fdbb047dfb8c743deaf2d4
Former-commit-id: e196f02cf7533498280b252e9c345f9b3c4a3629
2014-09-26 14:50:03 -05: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
Brian.Dyke
8245370186
Merge branch 'master_14.3.1' into asm_14.3.1
...
Former-commit-id: 6ed90023551e25216c10d05f2568593992326900
2014-09-26 13:02:49 -04:00
Richard Peter
941305b33d
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: 3daaa4e6b33bd284a088f290b40b7f63b4c27a43
2014-09-26 11:44:41 -05:00
Ron Anderson
b032f7f24e
Omaha #3622 Fix duplicate SiteActivationNotifications.
...
Check in the rest of the changes I missed the first time.
Change-Id: I8640f8f09aeb6019374a857daf335b27c69e0880
Former-commit-id: 67d19df57e57a77a0a1a83e695631a7a9cb22368
2014-09-26 11:39:06 -05:00
Richard Peter
a4668b64a6
Merge "Omaha #3622 Fix duplicate SiteActivationNotifications." into omaha_14.4.1
...
Former-commit-id: acbc667cfeab1ab6449a93967896e6e303bb238d
2014-09-26 11:27:53 -05: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
Ron Anderson
92575e8db3
Omaha #3622 Fix duplicate SiteActivationNotifications.
...
Change-Id: I647bf118f558721867722cfc13d889e637237911
Former-commit-id: 8f687189a5c71f3bd04b5e31f6a45606fe456386
2014-09-26 15:19:08 +00: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
Matthew Howard
7d93a588f4
Merge "ASM #16693 updated dictionary cleanup script" into asm_14.3.1
...
Former-commit-id: bc9c9b073e69825d5e040e1cca2f738719a7e4f7
2014-09-25 14:14:40 -05:00
Matthew Howard
128518c4d7
Merge "ASM #16693 Fix spelling checker swear words" into asm_14.3.1
...
Former-commit-id: 1c8a526f4f40eb4ef6fef55f9d49f8abe425b548
2014-09-25 14:14:24 -05: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
Nate Jensen
c0b7fc0ac7
Omaha #3571 better error handling of invalid geom with map caching
...
Change-Id: I3947613aab5a7789b32ea1d0e3a8e3091d9690d8
Former-commit-id: 0f2066e985dcbcedd2794ce226232efe999b1312
2014-09-25 11:30:27 -05:00
Kevin.Johnson
5a38528711
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: c36b732cc8057cf7b830de647998f679725760da
2014-09-25 10:50:07 -04:00
Nate Jensen
364aff9278
Merge "Omaha #3220 - Changes in the area configuration files for FSSObs monitors." into omaha_14.4.1
...
Former-commit-id: e2f23221c3f8301460df2945deb8c760cdf216e9
2014-09-25 08:44:50 -05: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
Slav Korolev
7b1a4c6774
Omaha #3220 - Changes in the area configuration files for FSSObs monitors.
...
Former-commit-id: d7a921d6206f5b09e7a6784c7e86b9167b74685f
2014-09-25 09:02:27 -04:00
Lee Venable
77afac746c
Merge "Issue #2757 - Fixed problem with adding and removing zones." into omaha_14.3.1
...
Former-commit-id: 2ec651b767555946485c8a087f891c8736f59105
2014-09-24 16:23:23 -05:00
Nate Jensen
4cf93c0acb
Omaha #3663 move airep and pirep plguins to ncep features
...
Change-Id: I2c9a274ee85b24e93800fa7c0f73739030995219
Former-commit-id: 8f743862722b2af08e6659ca3beb0366095bcf79
2014-09-24 15:20:17 -05: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
b1fa793541
Issue #2729 Revert changes made to PythonPreferenceStore.java in favor changes to GfePyIncludeUtil.java made in #3500 .
...
This reverts commit 11c8529862
2014-09-24 09:17:43 -05:00
Slav Korolev
443c7c7482
Issue #2757 - Fixed problem with adding and removing zones.
...
Former-commit-id: 31ccaf218df628327fe4b27d69a4500eb1dc8d84
2014-09-24 09:34:43 -04:00
Ying-Lian.Shi
87911e9c4a
ASM #16693 updated dictionary cleanup script
...
Change-Id: I431226edf9afdf2f85811e36a631926a37398203
Former-commit-id: bd9b2c16e78147a0d7929922ad31cd9c57979efb
2014-09-24 12:30:40 +00:00
Ying-Lian.Shi
2a38e3eca5
ASM #16693 Fix spelling checker swear words
...
Change-Id: I0a31429fa35a5c5a8f4d2f000021db4e4304de9e
Former-commit-id: 1686a947c8a740c34339d9cf17749a6b92d776ab
2014-09-24 12:08:43 +00: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
Nate Jensen
8db243045c
Merge "Omaha #3009 make ffmp play nice with collaboration" into omaha_14.4.1
...
Former-commit-id: b89acc052d5c0065e12c9e13cde1d4fffd115729
2014-09-23 16:17:27 -05:00
Nate Jensen
8ac422d642
Omaha #3009 make ffmp play nice with collaboration
...
Change-Id: Iccccec6dbe999d7677520a5b0f0464a2186f8174
Former-commit-id: ac15b82ed3c493a5ea8cca01ba304e95c965365e
2014-09-23 15:37:09 -05:00
Steve Harris
e09f3ab040
Omaha #3300 - Added another compiled nativeLib binary to finish the Merge tag 'OB_14.3.1-19m' into omaha_14.4.1
...
Former-commit-id: 230f4413d69d25ca4e8cafc23ec80b3bb79fea63
2014-09-23 15:30:55 -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
Nate Jensen
c9033dc300
Merge "Omaha #3627 Delete or replace dead or deprecated methods and classes from com.raytheon.uf.edex.decodertools" into omaha_14.4.1
...
Former-commit-id: 21ad2f0d0229235495edc9319e8493d8a6b4d6b4
2014-09-23 12:15:56 -05:00
Mark Peters
bd5996a599
Omaha #3627 Delete or replace dead or deprecated methods and classes from com.raytheon.uf.edex.decodertools
...
Change-Id: I65fee949e595b76be5c998dcd550b287928a1d65
Former-commit-id: 1350720111ceeb83893c5c0129eb41d662d16211
2014-09-23 12:12:22 -05:00
Richard Peter
c3880f78b2
Merge "Omaha #3591 Convert scripts to use DAF." into omaha_14.4.1
...
Former-commit-id: f782f11484b5aa1c9f64028a6d9241fa5b593453
2014-09-23 12:09:05 -05:00
Steve Harris
26155d4251
Omaha #3300 - Added compiled nativeLib binaries to finish the Merge tag 'OB_14.3.1-19m' into omaha_14.4.1
...
Former-commit-id: 785a6cb7ef5856e0bc0beb3fcf5657f74934111b
2014-09-23 12:02:08 -05:00
Steve Harris
7692e3f21d
Merge tag 'OB_14.3.1-19m' into omaha_14.4.1
...
Conflicts:
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/ext/imaging/GLColormappedImageExtension.java
cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/rsc/SatResource.java
cave/com.raytheon.viz.volumebrowser/localization/menus/xml/planesMenusPlanView.xml
edexOsgi/com.raytheon.edex.plugin.satellite/src/com/raytheon/edex/util/satellite/SatSpatialFactory.java
edexOsgi/com.raytheon.uf.common.colormap/src/com/raytheon/uf/common/colormap/prefs/DataMappingPreferences.java
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/mmp.xml
nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so
nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so
ohd/gov.noaa.nws.ohd.edex.plugin.hydrodualpol/src/gov/noaa/nws/ohd/edex/plugin/hydrodualpol/DSAProductProcessor.java
Former-commit-id: 72f387d2802c12eedfe5643616fe5a54420aef66
2014-09-23 11:41:10 -05:00
