Brian.Dyke
|
ffe2894555
|
Merge branch 'master_14.3.1' into asm_14.3.1
Former-commit-id: cb92ade16f [formerly 41e3037133] [formerly cb92ade16f [formerly 41e3037133] [formerly e6ac4980b9 [formerly b0fef17ac648ed5d13d6125fa600c915b131147d]]]
Former-commit-id: e6ac4980b9
Former-commit-id: 64fb434c9a [formerly 75e90d1117]
Former-commit-id: b16e50a929
|
2014-10-15 13:55:32 -04:00 |
|
David Friedman
|
65eaac9743
|
ASM #16844 - WarnGen can become disabled when moving storm track
Change-Id: Ic54b4f10eea64db40ce7f9c5a787fe344a8d916a
Former-commit-id: 455f1ad7aa [formerly 955809450d] [formerly 455f1ad7aa [formerly 955809450d] [formerly 68f985d668 [formerly f4000b425b8da6bb16fe124c0e5eaaab78a6b3b2]]]
Former-commit-id: 68f985d668
Former-commit-id: 3f1ed65033 [formerly 7176b476a2]
Former-commit-id: f325e4ad55
|
2014-10-10 19:33:21 +00:00 |
|
Brian.Dyke
|
fdfc95c5ff
|
Merge branch 'asm_14.3.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.3.1
Former-commit-id: 797a9c6c10 [formerly f85eb2d0ac] [formerly 797a9c6c10 [formerly f85eb2d0ac] [formerly 6ae3795b7c [formerly 344f436cfabfa5c1d0aa552467be7a6f9656a1ec]]]
Former-commit-id: 6ae3795b7c
Former-commit-id: 6034909d2d [formerly 36571c8238]
Former-commit-id: 969b40b517
|
2014-10-10 11:01:01 -04:00 |
|
Nate Jensen
|
2bb8579c76
|
Merge "Issue #3686 fix kml export when maps are the only thing loaded" into omaha_14.3.1
Former-commit-id: 9c95c255c2 [formerly ef6da2a181] [formerly 9c95c255c2 [formerly ef6da2a181] [formerly b2dcfdf572 [formerly 03ed17c8994b00ea37c1c591760c9b7c452dfcde]]]
Former-commit-id: b2dcfdf572
Former-commit-id: 3caa2b3a21 [formerly 58c8b04318]
Former-commit-id: 41729296aa
|
2014-10-06 15:53:19 -05:00 |
|
Nate Jensen
|
3c4e7bc755
|
Issue #3686 fix kml export when maps are the only thing loaded
Change-Id: I4741da935b0ef24bd8d0d0d114151404038828a0
Former-commit-id: f8278a9ad3 [formerly 446e0bcdf6] [formerly f8278a9ad3 [formerly 446e0bcdf6] [formerly 9025e166dd [formerly 9dac0fcf997feeecdd8c581ae8fd72581c32d095]]]
Former-commit-id: 9025e166dd
Former-commit-id: 06d562092d [formerly 00adad9546]
Former-commit-id: 7d4f951822
|
2014-10-06 15:41:42 -05:00 |
|
Michael Gamazaychikov
|
488cf033a9
|
ASM #513 - Maps loaded before opening WarnGen not retained when WarnGen is closed.
Change-Id: Iee5611826c4f26cec95daa6277c84a2e6a7ae410
Former-commit-id: 3851e4c961 [formerly f0b644d92e] [formerly 3851e4c961 [formerly f0b644d92e] [formerly e6d3baaa9c [formerly dff1c1d6fcc5fd0572dd924cfdf7979fc2a18463]]]
Former-commit-id: e6d3baaa9c
Former-commit-id: a2c89ea11c [formerly 4613f0e9d1]
Former-commit-id: 63f3558f48
|
2014-10-06 15:32:10 -04:00 |
|
Brian.Dyke
|
918de34464
|
Merge branch 'omaha_14.3.1' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.3.1
Former-commit-id: 85d83aefe0 [formerly f440da9c70] [formerly 85d83aefe0 [formerly f440da9c70] [formerly 92762f46c7 [formerly 23d16004c389f0ef708bee2a8bfb84d465b7b36b]]]
Former-commit-id: 92762f46c7
Former-commit-id: 64aef1a783 [formerly 4dbdf9de26]
Former-commit-id: 91f89ee1f6
|
2014-10-03 14:04:46 -04:00 |
|
Brian.Dyke
|
572bbdd019
|
Merge branch 'asm_14.3.1' of winter:/data/gerrit2/git/AWIPS2_baseline into master_14.3.1
Former-commit-id: db665d3876 [formerly 2a911984f0] [formerly db665d3876 [formerly 2a911984f0] [formerly 20dd249d2c [formerly 441fc7561a8526422f9b73b9c47cd220f0babb54]]]
Former-commit-id: 20dd249d2c
Former-commit-id: 46956a01c6 [formerly 72ea2fbe48]
Former-commit-id: a3ccdd9704
|
2014-10-02 10:44:50 -04:00 |
|
Brian.Dyke
|
e100894074
|
Merge branch 'mdl_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: 006bdb00ad [formerly 65ad6056b6] [formerly 006bdb00ad [formerly 65ad6056b6] [formerly f3f95aabb0 [formerly 8fa6749e28cb247ae63307f1423351c23ec0eb87]]]
Former-commit-id: f3f95aabb0
Former-commit-id: d174db3b0c [formerly e77f1e126e]
Former-commit-id: 1d2dfd264a
|
2014-10-02 10:38:51 -04:00 |
|
Brian.Dyke
|
c853463f73
|
Merge branch 'field_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: d4888adc0f [formerly f47840e4d9] [formerly d4888adc0f [formerly f47840e4d9] [formerly 2ac30f6c22 [formerly ece734cb6218a80fa2dda1b3c43673dc5a31bfbb]]]
Former-commit-id: 2ac30f6c22
Former-commit-id: 277b6e4b36 [formerly 36d377e08d]
Former-commit-id: 7e465baead
|
2014-10-02 10:24:04 -04:00 |
|
Steve Harris
|
18d68410e5
|
Merge branch 'master_14.3.1' (14.3.1-23) into omaha_14.3.1
Former-commit-id: 09d8955b31 [formerly e201e1a493] [formerly 09d8955b31 [formerly e201e1a493] [formerly cc34483b0b [formerly ace8473f96c6151918ee8ecf61e3b8986d98a68a]]]
Former-commit-id: cc34483b0b
Former-commit-id: 8a627b9bf6 [formerly d711c1b67b]
Former-commit-id: 074e12da64
|
2014-10-02 08:09:02 -05:00 |
|
Brian.Dyke
|
ea401b327b
|
Merge branch 'master_14.3.1' into asm_14.3.1
Former-commit-id: 0be927be2d [formerly 5ed17c0e24] [formerly 0be927be2d [formerly 5ed17c0e24] [formerly a4bfbea3c2 [formerly 622e63224b6d6bf1d6ced874658bbd9db381799b]]]
Former-commit-id: a4bfbea3c2
Former-commit-id: 4df4eb9c2b [formerly 914da168c8]
Former-commit-id: 8184df119d
|
2014-10-01 15:36:06 -04: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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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
|
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 |
|
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 |
|
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 |
|
Darrel Kingfield
|
11fd795d32
|
VLab Issue #4603 - MRMS SBN Display initial code check-in v3 - update purge rules; fixes #4603
Change-Id: Ic38722b3080edc3f9a9f8d35d4b2271d34b63872
Former-commit-id: 3eeaa8f359 [formerly 1cabae50b1] [formerly 3eeaa8f359 [formerly 1cabae50b1] [formerly 88a8dddef3 [formerly a9bc901ed4b9157a4cb1a042d5fabe628cfd4b2a]]]
Former-commit-id: 88a8dddef3
Former-commit-id: b5e546503c [formerly 00a056c154]
Former-commit-id: 142edfe588
|
2014-09-19 11:14:09 -05:00 |
|
Steve Harris
|
2937cfc9bf
|
Merge branch 'master_14.3.1' (14.3.1-19) into omaha_14.3.1
Former-commit-id: 0ef8105b04 [formerly 07a7645fcd] [formerly 0ef8105b04 [formerly 07a7645fcd] [formerly fbab75af66 [formerly c72e05b87f6eb6d094bde5e7caec3cccb20476ce]]]
Former-commit-id: fbab75af66
Former-commit-id: 0098868423 [formerly 4b24497a50]
Former-commit-id: 40f0882a7d
|
2014-09-19 11:13:46 -05:00 |
|
Ana Rivera
|
2302527f91
|
VLab Issue #4794 - RM 16720 Update LevelMappingFile.xml; fixes #4794
Change-Id: I58d0cb7e38d5ed483db5c87cc322c93764e21f06
Former-commit-id: 2a25376398 [formerly 9d8c08a09a] [formerly 2a25376398 [formerly 9d8c08a09a] [formerly 56f409717f [formerly 3af534fb2778268fee650c09c5aa0346df746ce8]]]
Former-commit-id: 56f409717f
Former-commit-id: 9bc42712de [formerly 030d8c45b7]
Former-commit-id: c12eb3b106
|
2014-09-19 15:17:46 +00:00 |
|
Brian.Dyke
|
64435ea860
|
Merge branch 'ohd_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: e70a9db68c [formerly c6b0adfc53] [formerly e70a9db68c [formerly c6b0adfc53] [formerly 8b0603cdb8 [formerly de22db308f36c42d5c7e0989dbd7decfaaf3adbb]]]
Former-commit-id: 8b0603cdb8
Former-commit-id: 87dfb0e978 [formerly d5f57cd98e]
Former-commit-id: 37ffb37db6
|
2014-09-18 12:43:01 -04:00 |
|
Chip Gobs
|
35439f3173
|
VLab Issue #4611
Adding missing changed file.
Change-Id: Ifcc56c121bb13806a5a5e7fc4e6de6e36900867e
Former-commit-id: 0e4b8d2e9b [formerly 0d046a56e8] [formerly 0e4b8d2e9b [formerly 0d046a56e8] [formerly 31efce6b8f [formerly e68f56628f035ca2a20848a0e76f6efa8bbe1e8a]]]
Former-commit-id: 31efce6b8f
Former-commit-id: aa838b2230 [formerly a287a95ef9]
Former-commit-id: 552430bda0
|
2014-09-18 12:12:42 -04:00 |
|
Matthew Howard
|
42ba5d61df
|
Merge "ASM #15465 - No variable for failed site's MND Header location available for WarnGen to use" into asm_14.3.1
Former-commit-id: f3764d3bd3 [formerly 27c31ea90f] [formerly f3764d3bd3 [formerly 27c31ea90f] [formerly 0d0aae9234 [formerly 0b0c2e1ea8188cd88c92fde4d4b999670aad17dc]]]
Former-commit-id: 0d0aae9234
Former-commit-id: 0f086d9e3d [formerly b49cd025b9]
Former-commit-id: 16b1766cc0
|
2014-09-18 10:36:17 -05:00 |
|