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 |
|
Nate Jensen
|
9e4bd6c1b7
|
Merge "Omaha #2975 fix mkdirs() bug" into omaha_14.4.1
Former-commit-id: aa43004f85 [formerly c643d7c706ef39d1c17926b2a99bcfa2e52c3193]
Former-commit-id: cddda47923
|
2014-10-02 07:57:30 -05:00 |
|
Slav Korolev
|
05a7f534bf
|
Issue #3659 - Enabled to display HFR-EAST_6KM or HFR-WEST_6KM data as a Time Series
Former-commit-id: ad4bae10c9 [formerly 2a03c64bb098a141c82aac4bab42d7d9f4a6296f]
Former-commit-id: f7bcb81010
|
2014-10-01 16:45:33 -04:00 |
|
Nate Jensen
|
dd72c8e139
|
Merge "Omaha #3638 plugin xml for *export.point is now properly included" into omaha_14.4.1
Former-commit-id: 53f2bf8395 [formerly 155fdc66bca15c242345858152fcf0b129e28a6d]
Former-commit-id: 116f6840e2
|
2014-10-01 15:06:03 -05: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 |
|
Andrew Benak
|
8ae0af5c6f
|
Omaha #3638 plugin xml for *export.point is now properly included
Change-Id: Ib06ea93a28222eefa1522697e407d725d59be909
Former-commit-id: 7c7510d471 [formerly 8c3cb6032fe79f68f24eb5dee7f3a820aa475257]
Former-commit-id: 659f4869bc
|
2014-10-01 14:30:28 -05:00 |
|
Nate Jensen
|
74883424ca
|
Omaha #2975 fix mkdirs() bug
Change-Id: I003f04748a2470dad7b90804d4c157eba44dbe4f
Former-commit-id: 87d1286a0c [formerly 3f63e3887f21b1cb5eb1ea1bb5225f492e161021]
Former-commit-id: 319ea78480
|
2014-10-01 14:22:22 -05:00 |
|
Nate Jensen
|
f7eac5f1db
|
Merge "Omaha #3678 don't enable jmx at alertviz or cave startup" into omaha_14.4.1
Former-commit-id: 3146dd083c [formerly 227ab9d68d59a9899025055a51b278bbcd9123f5]
Former-commit-id: a5e4190b35
|
2014-10-01 11:55:38 -05:00 |
|
Nate Jensen
|
fce7d5899f
|
Issue #3679 fix bug when performance pref page changes
Change-Id: I15db22a05e5f50b2555c924f61cd52245963ef15
Former-commit-id: f2633a56c0 [formerly e2d5957c02ba210e1964d00f37a00455f3326b37]
Former-commit-id: 482af416b3
|
2014-10-01 11:53:40 -05:00 |
|
Robert Blum
|
6a775aa2be
|
Omaha #3453 Inline Spellcheck - Fixed issues found while in Testing.
Former-commit-id: d5994a8a6b [formerly 9d9065714e1fffa3b65e0f2ccb724dc1dd7a4e7b]
Former-commit-id: a1d23e4198
|
2014-10-01 10:22:25 -05:00 |
|
Nate Jensen
|
131f5ec9f7
|
Omaha #3678 don't enable jmx at alertviz or cave startup
Change-Id: Ife722d85de8be57300a49aa3d21be02ff7cf39f7
Former-commit-id: 41427a57bb [formerly 501aa1ac560f34024ab906391dc8c22c422d8509]
Former-commit-id: 799ba1babf
|
2014-10-01 09:46:56 -05: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
|
c68b6c47ae
|
Merge branch 'omaha_14.4.1' into omaha_pda
Former-commit-id: 797520a4e6 [formerly 0804064f01610ff9873e997c8a0d026002b7c571]
Former-commit-id: 04546b20ef
|
2014-09-30 09:22:39 -05:00 |
|
Nate Jensen
|
6d382220a3
|
Merge "Issue #3669 Ensure best res does not parse alert messages." into omaha_14.3.1
Former-commit-id: 510d26050d [formerly 9e22fa02bb9f47d8332815059f2f5ae2d2ef6083]
Former-commit-id: 057e5eda1a
|
2014-09-29 17:50:34 -05:00 |
|
Nate Jensen
|
867a0e09ae
|
Omaha #3663 move features that contain primarily ncep plugins to ncep
folder
Change-Id: I5d59e1c0618fa26c1f8b3e6f340f255119a72a40
Former-commit-id: 8c0a087bf0 [formerly f785d88ee1c388b564921c3ecd8c931329639f04]
Former-commit-id: 1b51c48468
|
2014-09-29 17:24:34 -05:00 |
|
Ron Anderson
|
8116a665a8
|
Merge "Omaha #2975 optimize lookup of edit areas and gfe configs" into omaha_14.4.1
Former-commit-id: 245804a21a [formerly 918dcb1b91fb45b84a82df42b7fe2d3fc2f86fa0]
Former-commit-id: a9827b0545
|
2014-09-29 16:10:37 -05:00 |
|
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: 3b6a8a1447 [formerly c8b5d89c2e202e8bb4ad59d9ced8882ec8c2a6c1]
Former-commit-id: 90e08b96e1
|
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: c3648d1989 [formerly 860bcc70144d9a8478aef3cc9ebfe84e98b6c4a7]
Former-commit-id: 1b70e053a1
|
2014-09-29 12:29:25 -05:00 |
|
Ben Steffensmeier
|
b333960362
|
Issue #3669 Ensure best res does not parse alert messages.
Former-commit-id: 95b096192b [formerly e93157375f90c6cc2038db9a78346592e4d46b0e]
Former-commit-id: c573db2918
|
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: c03bc273da [formerly 49ad8e0e780443a0439227694a92ec8ab683b125]
Former-commit-id: 46da726675
|
2014-09-29 11:14:32 -05:00 |
|
Ben Steffensmeier
|
6090625040
|
Omaha #3132 - merge master_14.3.1 into omaha_14.4.1
Former-commit-id: 5b10ac2f36 [formerly 00d314b6b493bc34ccd77f731307b5039e22d844]
Former-commit-id: f92d021e96
|
2014-09-29 10:49:14 -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
|
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
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
Nate Jensen
|
1ec55dfc22
|
Omaha #3571 better error handling of invalid geom with map caching
Change-Id: I3947613aab5a7789b32ea1d0e3a8e3091d9690d8
Former-commit-id: 987060f56c [formerly 0f2066e985dcbcedd2794ce226232efe999b1312]
Former-commit-id: c0b7fc0ac7
|
2014-09-25 11:30:27 -05:00 |
|
Nate Jensen
|
e74bfdc195
|
Merge "Omaha #3220 - Changes in the area configuration files for FSSObs monitors." into omaha_14.4.1
Former-commit-id: 174b036c56 [formerly e2f23221c3f8301460df2945deb8c760cdf216e9]
Former-commit-id: 364aff9278
|
2014-09-25 08:44:50 -05:00 |
|
Slav Korolev
|
1120f9a440
|
Omaha #3220 - Changes in the area configuration files for FSSObs monitors.
Former-commit-id: ce2ef5019b [formerly d7a921d6206f5b09e7a6784c7e86b9167b74685f]
Former-commit-id: 7b1a4c6774
|
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: 5efe3232a7 [formerly 2ec651b767555946485c8a087f891c8736f59105]
Former-commit-id: 77afac746c
|
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: 36556fc48b [formerly 8f743862722b2af08e6659ca3beb0366095bcf79]
Former-commit-id: 4cf93c0acb
|
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: 9a0e9b17f4 [formerly 2c16492202230dcbec93cf390b47f400a77a545e]
Former-commit-id: 535f254357
|
2014-09-24 20:11:29 +00: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
|
1b011f4577
|
Issue #2729 Revert changes made to PythonPreferenceStore.java in favor changes to GfePyIncludeUtil.java made in #3500.
This reverts commit bd7e411653 [formerly 11c8529862] [formerly 2abfe6de77 [formerly 552c3e9485ee03c552851c98455e57f12a8f033f]].
Change-Id: I50a580d7c038b039cc8ebf3e05dd16c4453f8355
Former-commit-id: 61baeb4bcc [formerly d1c6475343160eeb02171fb8fc3b04f527203154]
Former-commit-id: b1fa793541
|
2014-09-24 09:17:43 -05: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 |
|
Ying-Lian.Shi
|
8eb9aac0b9
|
ASM #16693 Fix spelling checker swear words
Change-Id: I0a31429fa35a5c5a8f4d2f000021db4e4304de9e
Former-commit-id: 12c545ef7a [formerly 1686a947c8a740c34339d9cf17749a6b92d776ab]
Former-commit-id: 2a38e3eca5
|
2014-09-24 12:08:43 +00:00 |
|
Steve Harris
|
c1f8f3da76
|
Merge branch 'omaha_14.4.1' into omaha_pda
Former-commit-id: f1d1d9fc15 [formerly 03a52fa50e7e51eccf7ccc8d80c851c3ab221fdb]
Former-commit-id: 374a8cf99b
|
2014-09-23 21:43:25 -05: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 |
|
Nate Jensen
|
9a70b28032
|
Omaha #3009 make ffmp play nice with collaboration
Change-Id: Iccccec6dbe999d7677520a5b0f0464a2186f8174
Former-commit-id: e34c1a6fe8 [formerly ac15b82ed3c493a5ea8cca01ba304e95c965365e]
Former-commit-id: 8ac422d642
|
2014-09-23 15:37:09 -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 |
|
Steve Harris
|
2e2072a963
|
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: b979960b7b [formerly 72f387d2802c12eedfe5643616fe5a54420aef66]
Former-commit-id: 7692e3f21d
|
2014-09-23 11:41:10 -05:00 |
|
Lee Venable
|
cfb35a88f9
|
Merge "Omaha #3356 remove unnecessary import" into omaha_14.4.1
Former-commit-id: 114010674f [formerly a158d4dbdf27311a04684bbda1afb3991fb0e09a]
Former-commit-id: b82ea41f9d
|
2014-09-23 10:56:20 -05:00 |
|
Nate Jensen
|
92c1027ff7
|
Omaha #3356 remove unnecessary import
Change-Id: Id1ad295d1adb29de072173a4137a5e5f612b48ac
Former-commit-id: 568559f2ce [formerly ad3753d57709fe8efeab2fb400d92b6ec61c2a3e]
Former-commit-id: 41fcd2b7b6
|
2014-09-23 08:21:18 -05:00 |
|