Nate Jensen
|
647dc473bf
|
Merge "Omaha #3678 don't enable jmx at alertviz or cave startup" into omaha_14.4.1
Former-commit-id: f7eac5f1db [formerly a5e4190b35] [formerly f7eac5f1db [formerly a5e4190b35] [formerly 3146dd083c [formerly 227ab9d68d59a9899025055a51b278bbcd9123f5]]]
Former-commit-id: 3146dd083c
Former-commit-id: e65065461c [formerly 728328f400]
Former-commit-id: d148780c7c
|
2014-10-01 11:55:38 -05:00 |
|
Nate Jensen
|
d4b7693f81
|
Issue #3679 fix bug when performance pref page changes
Change-Id: I15db22a05e5f50b2555c924f61cd52245963ef15
Former-commit-id: fce7d5899f [formerly 482af416b3] [formerly fce7d5899f [formerly 482af416b3] [formerly f2633a56c0 [formerly e2d5957c02ba210e1964d00f37a00455f3326b37]]]
Former-commit-id: f2633a56c0
Former-commit-id: f7a075907c [formerly 18acca9ef8]
Former-commit-id: b5998c975b
|
2014-10-01 11:53:40 -05:00 |
|
Robert Blum
|
2d7c61f0a8
|
Omaha #3453 Inline Spellcheck - Fixed issues found while in Testing.
Former-commit-id: 6a775aa2be [formerly a1d23e4198] [formerly 6a775aa2be [formerly a1d23e4198] [formerly d5994a8a6b [formerly 9d9065714e1fffa3b65e0f2ccb724dc1dd7a4e7b]]]
Former-commit-id: d5994a8a6b
Former-commit-id: 4bb7ed8b2f [formerly 6c1676e743]
Former-commit-id: 100e24245f
|
2014-10-01 10:22:25 -05:00 |
|
Nate Jensen
|
18f7a6f1c0
|
Omaha #3678 don't enable jmx at alertviz or cave startup
Change-Id: Ife722d85de8be57300a49aa3d21be02ff7cf39f7
Former-commit-id: 131f5ec9f7 [formerly 799ba1babf] [formerly 131f5ec9f7 [formerly 799ba1babf] [formerly 41427a57bb [formerly 501aa1ac560f34024ab906391dc8c22c422d8509]]]
Former-commit-id: 41427a57bb
Former-commit-id: e6100e8e7f [formerly 78054658a3]
Former-commit-id: 86271d7dc9
|
2014-10-01 09:46:56 -05:00 |
|
dmsys
|
71d6e48473
|
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: f704781f4f [formerly 8c3625cfec] [formerly f704781f4f [formerly 8c3625cfec] [formerly 9f4560c480 [formerly 0bf7ecb27d41f81f1d6727674fc1475eeaa8512c]]]
Former-commit-id: 9f4560c480
Former-commit-id: 07f84c6b26 [formerly b884e5e32d]
Former-commit-id: e00ea2d8cd
|
2014-09-30 13:45:54 -04:00 |
|
Nate Jensen
|
3f983b9fa4
|
Merge "Issue #3669 Ensure best res does not parse alert messages." into omaha_14.3.1
Former-commit-id: 6d382220a3 [formerly 057e5eda1a] [formerly 6d382220a3 [formerly 057e5eda1a] [formerly 510d26050d [formerly 9e22fa02bb9f47d8332815059f2f5ae2d2ef6083]]]
Former-commit-id: 510d26050d
Former-commit-id: aa526b5dfd [formerly a79d34801b]
Former-commit-id: eaaacc67c6
|
2014-09-29 17:50:34 -05:00 |
|
Nate Jensen
|
9875b5a58f
|
Omaha #3663 move features that contain primarily ncep plugins to ncep
folder
Change-Id: I5d59e1c0618fa26c1f8b3e6f340f255119a72a40
Former-commit-id: 867a0e09ae [formerly 1b51c48468] [formerly 867a0e09ae [formerly 1b51c48468] [formerly 8c0a087bf0 [formerly f785d88ee1c388b564921c3ecd8c931329639f04]]]
Former-commit-id: 8c0a087bf0
Former-commit-id: 12ede9423a [formerly d4793b5521]
Former-commit-id: 900768960a
|
2014-09-29 17:24:34 -05:00 |
|
Ron Anderson
|
0e924a980f
|
Merge "Omaha #2975 optimize lookup of edit areas and gfe configs" into omaha_14.4.1
Former-commit-id: 8116a665a8 [formerly a9827b0545] [formerly 8116a665a8 [formerly a9827b0545] [formerly 245804a21a [formerly 918dcb1b91fb45b84a82df42b7fe2d3fc2f86fa0]]]
Former-commit-id: 245804a21a
Former-commit-id: d1ef4c7284 [formerly 4ebb5b59df]
Former-commit-id: 923aca6f7f
|
2014-09-29 16:10:37 -05:00 |
|
Steve Harris
|
4c4380580f
|
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: 3598e9b5b6 [formerly 90e08b96e1] [formerly 3598e9b5b6 [formerly 90e08b96e1] [formerly 3b6a8a1447 [formerly c8b5d89c2e202e8bb4ad59d9ced8882ec8c2a6c1]]]
Former-commit-id: 3b6a8a1447
Former-commit-id: 842abaad49 [formerly 6330a62e85]
Former-commit-id: 30f0d27dfb
|
2014-09-29 12:58:56 -05:00 |
|
Nate Jensen
|
db4d16b3a0
|
Omaha #2975 optimize lookup of edit areas and gfe configs
Change-Id: Ic89c84e79a27476ebb28573d49f60429424d4c37
Former-commit-id: c75ff5530d [formerly 1b70e053a1] [formerly c75ff5530d [formerly 1b70e053a1] [formerly c3648d1989 [formerly 860bcc70144d9a8478aef3cc9ebfe84e98b6c4a7]]]
Former-commit-id: c3648d1989
Former-commit-id: 32bd82e744 [formerly 0b2e919eae]
Former-commit-id: 98ff4d7cc5
|
2014-09-29 12:29:25 -05:00 |
|
Ben Steffensmeier
|
41b2311008
|
Issue #3669 Ensure best res does not parse alert messages.
Former-commit-id: b333960362 [formerly c573db2918] [formerly b333960362 [formerly c573db2918] [formerly 95b096192b [formerly e93157375f90c6cc2038db9a78346592e4d46b0e]]]
Former-commit-id: 95b096192b
Former-commit-id: 923ead3167 [formerly 3c55b8166c]
Former-commit-id: dc7966cdec
|
2014-09-29 11:20:33 -05:00 |
|
Steve Harris
|
d19a7675a9
|
Merge branch 'master_14.3.1' (14.3.1-21,22) into omaha_14.3.1
Former-commit-id: fdfe16985d [formerly 46da726675] [formerly fdfe16985d [formerly 46da726675] [formerly c03bc273da [formerly 49ad8e0e780443a0439227694a92ec8ab683b125]]]
Former-commit-id: c03bc273da
Former-commit-id: dd92661aba [formerly 7c37aaa92e]
Former-commit-id: af7f1cf232
|
2014-09-29 11:14:32 -05:00 |
|
Ben Steffensmeier
|
a69ec7c7af
|
Omaha #3132 - merge master_14.3.1 into omaha_14.4.1
Former-commit-id: 6090625040 [formerly f92d021e96] [formerly 6090625040 [formerly f92d021e96] [formerly 5b10ac2f36 [formerly 00d314b6b493bc34ccd77f731307b5039e22d844]]]
Former-commit-id: 5b10ac2f36
Former-commit-id: 0724aa4e71 [formerly 107ccbf332]
Former-commit-id: fc49d0bd55
|
2014-09-29 10:49:14 -05:00 |
|
Brian.Dyke
|
23450210b1
|
Merge branch 'master_14.2.3' into master_14.2.4
Former-commit-id: fce029653d [formerly 0a497fc015] [formerly fce029653d [formerly 0a497fc015] [formerly 46af1d0857 [formerly 01cb1dc674ae1249d97dc10be5c068de0ed2a222]]]
Former-commit-id: 46af1d0857
Former-commit-id: 886c1b7e3d [formerly 85676ff532]
Former-commit-id: 4d5f7db303
|
2014-09-29 11:20:57 -04:00 |
|
Brian.Dyke
|
ab28cb0583
|
Merge branch 'asm_14.2.3' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.2.3
Former-commit-id: 8e459ec500 [formerly 550ffba7b0] [formerly 8e459ec500 [formerly 550ffba7b0] [formerly 142432ba5e [formerly 93ddf672c137c7221e9595e8b5c1b279084cb451]]]
Former-commit-id: 142432ba5e
Former-commit-id: 5da730103f [formerly 63e3d61ff5]
Former-commit-id: de0dc96df8
|
2014-09-26 16:14:06 -04:00 |
|
David Friedman
|
cd643396d6
|
ASM #15658 - WarnGen: inclusion of watch information in marine products
Change-Id: I13d9e58b1df3dd434cdea66060dbc5886c0e27f2
Former-commit-id: 86100b6ca8 [formerly 6791e8d885] [formerly 86100b6ca8 [formerly 6791e8d885] [formerly 05707d0f20 [formerly 78cc67f9d2f86c2088ffc5695c4dea879a9e2ebb]]]
Former-commit-id: 05707d0f20
Former-commit-id: 78f7f0fc88 [formerly b3bd3a9d7f]
Former-commit-id: 1204c0d666
|
2014-09-26 20:05:46 +00:00 |
|
Brian.Dyke
|
b481c3f064
|
Merge branch 'field_14.2.4' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.2.4
Former-commit-id: 396f9755dc [formerly 1ac61fb612] [formerly 396f9755dc [formerly 1ac61fb612] [formerly f26fe97ec4 [formerly 5b570e5229628de88068edee1c70c26eec13f71a]]]
Former-commit-id: f26fe97ec4
Former-commit-id: f6af0dd0df [formerly 33525968e3]
Former-commit-id: 4359e8dc47
|
2014-09-26 14:19:03 -04:00 |
|
Brian.Dyke
|
ccbb922254
|
Merge branch 'master_14.3.1' into asm_14.3.1
Former-commit-id: f520ff97b6 [formerly 8245370186] [formerly f520ff97b6 [formerly 8245370186] [formerly a4f68caac6 [formerly 6ed90023551e25216c10d05f2568593992326900]]]
Former-commit-id: a4f68caac6
Former-commit-id: 328edcaebf [formerly 34a073a848]
Former-commit-id: 554cb1a84d
|
2014-09-26 13:02:49 -04:00 |
|
Brian.Dyke
|
7f65a5b799
|
Merge branch 'omaha_14.2.3' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.2.3
Former-commit-id: 0045c3100f [formerly 586a504500] [formerly 0045c3100f [formerly 586a504500] [formerly bd983e1932 [formerly d6369c8346d1ed4d86ed3eb7adc47de0891c7fd7]]]
Former-commit-id: bd983e1932
Former-commit-id: 30f8b55a19 [formerly 95d80abd56]
Former-commit-id: 295e2814f7
|
2014-09-26 11:47:38 -04:00 |
|
David Friedman
|
140950a966
|
ASM #15551 - WarnGen: only WCN should be used while including TOR/SVR watches in WarnGen products
Change-Id: I8b8e9ae40596e5a3d5f0aa44d2e946aa7a68a1ae
Former-commit-id: 1737d16a5c [formerly 33aee54b8f] [formerly 1737d16a5c [formerly 33aee54b8f] [formerly db29ec9dec [formerly c8aa2fbfc35c872e2d50de2212eaf16db9b5483d]]]
Former-commit-id: db29ec9dec
Former-commit-id: f207169057 [formerly bda6e42529]
Former-commit-id: a740acaedf
|
2014-09-26 15:13:56 +00:00 |
|
David Friedman
|
a45e6dfdcf
|
ASM #15551 - WarnGen: only WCN should be used while including TOR/SVR watches in WarnGen products
Change-Id: I1698025cad4310f8fc30938294c161c1f9797f03
Former-commit-id: cfcfc17a2b [formerly 41820f112f] [formerly cfcfc17a2b [formerly 41820f112f] [formerly c85b0d1cfd [formerly 70b520c08670646047ffa753814f98c032938ff8]]]
Former-commit-id: c85b0d1cfd
Former-commit-id: 7f9fdcb74b [formerly f6d3a80dbf]
Former-commit-id: d1160ea2ca
|
2014-09-26 13:07:28 +00:00 |
|
David Friedman
|
73b0da212a
|
ASM #16783 - Warngen: Possible problem when there are two effective VTEC actions for a watch
Change-Id: I76599d23396fe64c9448440787e67d752ed6b028
Former-commit-id: c16f5c2e7c [formerly 5755c120d5] [formerly c16f5c2e7c [formerly 5755c120d5] [formerly e82f96193e [formerly 117c2f072b647e353456832f2f0088d51a660d65]]]
Former-commit-id: e82f96193e
Former-commit-id: 214002e207 [formerly 07befd1cce]
Former-commit-id: 4aa2667d1f
|
2014-09-25 22:10:42 +00:00 |
|
David Friedman
|
0a94f1ccfb
|
ASM #16773 - WarnGen can become disabled when a followup is selected
Change-Id: Ibe0e3b18914840515f8bc9d844a2ffb0a6abddf0
Former-commit-id: 973d0b9a55 [formerly b3025aacb0] [formerly 973d0b9a55 [formerly b3025aacb0] [formerly 8ab4649312 [formerly 5048af915b004067ec8a6e788a0e9ad3e006c9d8]]]
Former-commit-id: 8ab4649312
Former-commit-id: a10060f45d [formerly c19d9ee755]
Former-commit-id: f6a6032d61
|
2014-09-25 21:07:16 +00:00 |
|
Qinglu.Lin
|
73c0213b36
|
ASM #15551 - WarnGen: only WCN should be used while including TOR/SVR watches in WarnGen products
Change-Id: I33fb6fab8d49aca4f12f76c763e5f3ddbd9272b5
Former-commit-id: 1c55b5c400 [formerly 94fed71091] [formerly 1c55b5c400 [formerly 94fed71091] [formerly ef851d0016 [formerly 8b194664458246dad7509c44bcc07480cb088ddd]]]
Former-commit-id: ef851d0016
Former-commit-id: 94e636a862 [formerly 3e1d8d83a9]
Former-commit-id: c3be043b3a
|
2014-09-25 15:16:42 -04:00 |
|
Ana Rivera
|
ab3de760b0
|
VLab Issue #4794 - O&M RM16720; Update planesMenusPlanView.xml; fixes #4794
Change-Id: I8e4b7c563e74e18c3c60e858cd7e6bd3cdaff8e8
Former-commit-id: e55855b4ff [formerly d96f5fe229] [formerly e55855b4ff [formerly d96f5fe229] [formerly a72725f9ef [formerly 833cff4f37542078578de96b3b59723f77c31f4c]]]
Former-commit-id: a72725f9ef
Former-commit-id: 1b94e7fdb2 [formerly dd45d98a0e]
Former-commit-id: 97ae16163f
|
2014-09-25 17:46:53 +00:00 |
|
Nate Jensen
|
e83580e13a
|
Omaha #3571 better error handling of invalid geom with map caching
Change-Id: I3947613aab5a7789b32ea1d0e3a8e3091d9690d8
Former-commit-id: 1ec55dfc22 [formerly c0b7fc0ac7] [formerly 1ec55dfc22 [formerly c0b7fc0ac7] [formerly 987060f56c [formerly 0f2066e985dcbcedd2794ce226232efe999b1312]]]
Former-commit-id: 987060f56c
Former-commit-id: 06c02a04b6 [formerly aa370e474e]
Former-commit-id: 3028f3ab1f
|
2014-09-25 11:30:27 -05:00 |
|
Nate Jensen
|
3c7d92703e
|
Merge "Omaha #3220 - Changes in the area configuration files for FSSObs monitors." into omaha_14.4.1
Former-commit-id: e74bfdc195 [formerly 364aff9278] [formerly e74bfdc195 [formerly 364aff9278] [formerly 174b036c56 [formerly e2f23221c3f8301460df2945deb8c760cdf216e9]]]
Former-commit-id: 174b036c56
Former-commit-id: d1171b2e18 [formerly ad6bd4e7ff]
Former-commit-id: eb077c4bcf
|
2014-09-25 08:44:50 -05:00 |
|
Slav Korolev
|
27f8c438d2
|
Omaha #3220 - Changes in the area configuration files for FSSObs monitors.
Former-commit-id: 1120f9a440 [formerly 7b1a4c6774] [formerly 1120f9a440 [formerly 7b1a4c6774] [formerly ce2ef5019b [formerly d7a921d6206f5b09e7a6784c7e86b9167b74685f]]]
Former-commit-id: ce2ef5019b
Former-commit-id: 7e739e4197 [formerly 11ee774939]
Former-commit-id: 3033eba2f3
|
2014-09-25 09:02:27 -04:00 |
|
Lee Venable
|
fedc9eafe0
|
Merge "Issue #2757 - Fixed problem with adding and removing zones." into omaha_14.3.1
Former-commit-id: 1d52729e38 [formerly 77afac746c] [formerly 1d52729e38 [formerly 77afac746c] [formerly 5efe3232a7 [formerly 2ec651b767555946485c8a087f891c8736f59105]]]
Former-commit-id: 5efe3232a7
Former-commit-id: a4843f555c [formerly ef4b05effe]
Former-commit-id: 17b90500d7
|
2014-09-24 16:23:23 -05:00 |
|
Nate Jensen
|
8096bd8fdc
|
Omaha #3663 move airep and pirep plguins to ncep features
Change-Id: I2c9a274ee85b24e93800fa7c0f73739030995219
Former-commit-id: 86b76b399d [formerly 4cf93c0acb] [formerly 86b76b399d [formerly 4cf93c0acb] [formerly 36556fc48b [formerly 8f743862722b2af08e6659ca3beb0366095bcf79]]]
Former-commit-id: 36556fc48b
Former-commit-id: f2432e5a47 [formerly 98d47a8dd2]
Former-commit-id: 6bfa9cd589
|
2014-09-24 15:20:17 -05:00 |
|
Ana Rivera
|
f4714fb5d4
|
VLab Issue #4669 - Add Beach Hazards Statement (RM 13467); fixes #4669
Change-Id: I54c1055b87b7bfab0a35fd391c6ef7156fc3d297
Former-commit-id: bb533d9ddd [formerly 535f254357] [formerly bb533d9ddd [formerly 535f254357] [formerly 9a0e9b17f4 [formerly 2c16492202230dcbec93cf390b47f400a77a545e]]]
Former-commit-id: 9a0e9b17f4
Former-commit-id: 70b0854582 [formerly ed7119ed4e]
Former-commit-id: 42a6d22008
|
2014-09-24 20:11:29 +00:00 |
|
Brian.Dyke
|
c22973f909
|
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: b49b13f77e [formerly 4b418918d4] [formerly b49b13f77e [formerly 4b418918d4] [formerly 87fa32d2d4 [formerly e04ad21771ce410beb25e15fe300a34796a1a062]]]
Former-commit-id: 87fa32d2d4
Former-commit-id: cf8f88a5b3 [formerly 1f09dad9e9]
Former-commit-id: 8997f79ae4
|
2014-09-24 11:05:37 -04:00 |
|
Ron Anderson
|
2e85e49150
|
Issue #2729 Revert changes made to PythonPreferenceStore.java in favor changes to GfePyIncludeUtil.java made in #3500.
This reverts commit 7f87c532a488924b997b8d3d0b855d6b26f7df7a [formerly 2abfe6de77] [formerly bd7e411653 [formerly 11c8529862] [formerly bd7e411653 [formerly 11c8529862] [formerly 2abfe6de77 [formerly 552c3e9485ee03c552851c98455e57f12a8f033f]]]].
Change-Id: I50a580d7c038b039cc8ebf3e05dd16c4453f8355
Former-commit-id: 1b011f4577 [formerly b1fa793541] [formerly 1b011f4577 [formerly b1fa793541] [formerly 61baeb4bcc [formerly d1c6475343160eeb02171fb8fc3b04f527203154]]]
Former-commit-id: 61baeb4bcc
Former-commit-id: e0a3310ca9 [formerly d27daaea68]
Former-commit-id: 6e39378a9d
|
2014-09-24 09:17:43 -05:00 |
|
Slav Korolev
|
a0a543439f
|
Issue #2757 - Fixed problem with adding and removing zones.
Former-commit-id: 4c209b4958 [formerly 443c7c7482] [formerly 4c209b4958 [formerly 443c7c7482] [formerly a4914bd85d [formerly 31ccaf218df628327fe4b27d69a4500eb1dc8d84]]]
Former-commit-id: a4914bd85d
Former-commit-id: 1596ad20b6 [formerly d08b42a7de]
Former-commit-id: 512ca34484
|
2014-09-24 09:34:43 -04:00 |
|
Ying-Lian.Shi
|
925c953e9e
|
ASM #16693 Fix spelling checker swear words
Change-Id: I0a31429fa35a5c5a8f4d2f000021db4e4304de9e
Former-commit-id: 8eb9aac0b9 [formerly 2a38e3eca5] [formerly 8eb9aac0b9 [formerly 2a38e3eca5] [formerly 12c545ef7a [formerly 1686a947c8a740c34339d9cf17749a6b92d776ab]]]
Former-commit-id: 12c545ef7a
Former-commit-id: 476d52b18d [formerly f26b61bbb7]
Former-commit-id: 49389f41f4
|
2014-09-24 12:08:43 +00:00 |
|
Ron Anderson
|
dcf6d96c18
|
Issue #3648 Improve GFE error handling for getAllAvailableParms.
Change-Id: I13d41a3c231a56fe7d6fc4bc3cbfd96e1bdcdccf
Former-commit-id: 8d0d43a437 [formerly 429de3224f] [formerly 8d0d43a437 [formerly 429de3224f] [formerly c37618c16c [formerly b77b3c916b4dcc9034408220006f941cd301ed3c]]]
Former-commit-id: c37618c16c
Former-commit-id: 99f47f37fd [formerly 0ad9b46bce]
Former-commit-id: a3ae3bcb74
|
2014-09-23 18:47:38 -05:00 |
|
Nate Jensen
|
d1aaffd9c2
|
Omaha #3009 make ffmp play nice with collaboration
Change-Id: Iccccec6dbe999d7677520a5b0f0464a2186f8174
Former-commit-id: 9a70b28032 [formerly 8ac422d642] [formerly 9a70b28032 [formerly 8ac422d642] [formerly e34c1a6fe8 [formerly ac15b82ed3c493a5ea8cca01ba304e95c965365e]]]
Former-commit-id: e34c1a6fe8
Former-commit-id: a0180bad18 [formerly 93432f2a4d]
Former-commit-id: 85d4a24b2b
|
2014-09-23 15:37:09 -05:00 |
|
David Friedman
|
7ee76a9b2a
|
ASM #15658 - WarnGen: inclusion of watch information in marine products
Change-Id: I545d1b07444c9ca00ea2e95c4ccaed79946bbead
Former-commit-id: 0ed1ce5726 [formerly a6acf71a0a] [formerly 0ed1ce5726 [formerly a6acf71a0a] [formerly 2ee1ebe72d [formerly e0f6cc70bf5258d66bfa8a4ddb1daf871b6c92c5]]]
Former-commit-id: 2ee1ebe72d
Former-commit-id: c720756850 [formerly 4b3f5bc5c7]
Former-commit-id: 3ee52065d1
|
2014-09-23 18:39:22 +00:00 |
|
Steve Harris
|
d3169a96b0
|
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: 2e2072a963 [formerly 7692e3f21d] [formerly 2e2072a963 [formerly 7692e3f21d] [formerly b979960b7b [formerly 72f387d2802c12eedfe5643616fe5a54420aef66]]]
Former-commit-id: b979960b7b
Former-commit-id: e5f8a8f74f [formerly 50d6dccd09]
Former-commit-id: f831536854
|
2014-09-23 11:41:10 -05:00 |
|
Lee Venable
|
ec2e68f901
|
Merge "Omaha #3356 remove unnecessary import" into omaha_14.4.1
Former-commit-id: cfb35a88f9 [formerly b82ea41f9d] [formerly cfb35a88f9 [formerly b82ea41f9d] [formerly 114010674f [formerly a158d4dbdf27311a04684bbda1afb3991fb0e09a]]]
Former-commit-id: 114010674f
Former-commit-id: b4f2aed1b0 [formerly f88f41446a]
Former-commit-id: 192b865509
|
2014-09-23 10:56:20 -05:00 |
|
Nate Jensen
|
4b16070472
|
Omaha #3356 remove unnecessary import
Change-Id: Id1ad295d1adb29de072173a4137a5e5f612b48ac
Former-commit-id: 92c1027ff7 [formerly 41fcd2b7b6] [formerly 92c1027ff7 [formerly 41fcd2b7b6] [formerly 568559f2ce [formerly ad3753d57709fe8efeab2fb400d92b6ec61c2a3e]]]
Former-commit-id: 568559f2ce
Former-commit-id: b30c3d1b7c [formerly 9f04152945]
Former-commit-id: 4e8a58e91e
|
2014-09-23 08:21:18 -05:00 |
|
Steve Harris
|
43b4afdc3e
|
Merge branch 'master_14.3.1' (14.3.1-20) into omaha_14.3.1
Former-commit-id: fa6f4c608d [formerly 3301300c7e] [formerly fa6f4c608d [formerly 3301300c7e] [formerly 00eda3f982 [formerly 68ff0acbe3739e2fd3aa89b13ed070c39db48551]]]
Former-commit-id: 00eda3f982
Former-commit-id: c9e98dae9d [formerly 9a8deadc26]
Former-commit-id: aed5845596
|
2014-09-22 22:18:26 -05:00 |
|
Brian.Dyke
|
8371933be1
|
Merge branch 'master_14.3.1' into asm_14.3.1
Former-commit-id: a1dd6b20ab [formerly 5d0347f589] [formerly a1dd6b20ab [formerly 5d0347f589] [formerly 7996916e36 [formerly 414a695e6423fa291936d15a999113f4a518b097]]]
Former-commit-id: 7996916e36
Former-commit-id: 41bffe239e [formerly 3f4c66160f]
Former-commit-id: 8b7e576244
|
2014-09-22 16:51:47 -04:00 |
|
Nate Jensen
|
ff738247f3
|
Omaha #3356 fix apps_dir setting detection in viz/cave
Change-Id: If78a4ec84f6237450a6494c06b5a5271c66f10a3
Former-commit-id: 9ef3bce809 [formerly e163ae0e5b] [formerly 9ef3bce809 [formerly e163ae0e5b] [formerly e637963736 [formerly ca8195c7835b9d96158d048fdd548cc744ba96bc]]]
Former-commit-id: e637963736
Former-commit-id: 0ef93eb57a [formerly 9c316ec38c]
Former-commit-id: 6ff3a4435d
|
2014-09-22 13:00:04 -05:00 |
|
Brian.Dyke
|
763439c814
|
Merge branch 'asm_14.3.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.3.1
Former-commit-id: 75f3bb31d5 [formerly 4db67c581c] [formerly 75f3bb31d5 [formerly 4db67c581c] [formerly 8d665b93b5 [formerly 8d5d8cdfd272f8000a6a21a4128998889eb2ab30]]]
Former-commit-id: 8d665b93b5
Former-commit-id: 12bf31b5ba [formerly b83e12da28]
Former-commit-id: c4d7c97897
|
2014-09-19 16:56:50 -04:00 |
|
Ben Steffensmeier
|
4e6c331288
|
Omaha #3300 Fix component and mosaic merge problems
Former-commit-id: 766fdd80a8 [formerly 72f5799c44] [formerly 766fdd80a8 [formerly 72f5799c44] [formerly 217caaba15 [formerly 201854ac4154dc8526bf99bde69674ad51ec50ad]]]
Former-commit-id: 217caaba15
Former-commit-id: 66eae6f360 [formerly c02072c2e2]
Former-commit-id: f4fef04e89
|
2014-09-19 15:08:21 -05:00 |
|
Slav Korolev
|
48cf5d015d
|
Issue #2757 - Updated handlers for dialog buttons.
Former-commit-id: d2dd00d2ae [formerly 71c4d8db07] [formerly d2dd00d2ae [formerly 71c4d8db07] [formerly 23ec338be0 [formerly 69a82633c287bf18c9f436014bb552829dcb62ea]]]
Former-commit-id: 23ec338be0
Former-commit-id: 6b67a43b72 [formerly 780dedce8a]
Former-commit-id: d576d1d2fd
|
2014-09-19 15:02:59 -04:00 |
|
Brian.Dyke
|
d1c45356d3
|
Merge branch 'ncep_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: 9fc3eb20c1 [formerly 6ad8d500ef] [formerly 9fc3eb20c1 [formerly 6ad8d500ef] [formerly 9c33ae6d2c [formerly e895f7927a95c2416c05953e131d9e0c6095beb3]]]
Former-commit-id: 9c33ae6d2c
Former-commit-id: a97370769f [formerly 3b48d6368d]
Former-commit-id: 2a456a1b9b
|
2014-09-19 14:42:29 -04:00 |
|
Brian.Dyke
|
caa450388a
|
Merge branch 'field_14.2.4' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.2.4
Former-commit-id: 813d2be68e [formerly 88d5f872ae] [formerly 813d2be68e [formerly 88d5f872ae] [formerly 9435507b27 [formerly aaae61509d743553186cdefdea0557158b139527]]]
Former-commit-id: 9435507b27
Former-commit-id: c94cc5fe38 [formerly 1b8af8379f]
Former-commit-id: ebbb7003d9
|
2014-09-19 13:14:13 -04:00 |
|
Brian.Dyke
|
11e45913f1
|
Merge branch 'master_14.2.3' into master_14.2.4
Former-commit-id: 279f67ff54 [formerly 7f49052445] [formerly 279f67ff54 [formerly 7f49052445] [formerly e601d3fa51 [formerly 88e26cd8b378ffc81db87aee226ceca47ae58aa7]]]
Former-commit-id: e601d3fa51
Former-commit-id: a4f3bc977a [formerly 418ba90277]
Former-commit-id: 2d6b354631
|
2014-09-19 13:08:06 -04:00 |
|