Commit graph

3473 commits

Author SHA1 Message Date
Fay.Liang
a95b5b878f Merge branch 'asm_14.3.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.3.1
Former-commit-id: 4d9470b6e7 [formerly 03bab427df] [formerly 4d9470b6e7 [formerly 03bab427df] [formerly dd3df6b426 [formerly f88d457b62161250b44f9cdcbf025fafca43174b]]]
Former-commit-id: dd3df6b426
Former-commit-id: 7a4be56766 [formerly 8a0c97f94d]
Former-commit-id: d4872e355c
2014-12-15 12:44:05 -05:00
steve.naples
bde4caa4a4 ASM #16911 - Updated to fix Ending Hydrologic data when time is after 18Z.
Change-Id: Ia3022f07f1ebc54543b6e210d77d95b1458b434b

Former-commit-id: 9e13d77410 [formerly 2757754c9e] [formerly 9e13d77410 [formerly 2757754c9e] [formerly 9c0e08a03c [formerly 571f7dde74c6cbf14553edc2fe27a5031e42d6be]]]
Former-commit-id: 9c0e08a03c
Former-commit-id: fd77d4db50 [formerly 854070cdfb]
Former-commit-id: 12605dd185
2014-12-13 01:55:19 +00:00
Fay.Liang
76f86d8377 Merge branch 'omaha_14.3.1' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.3.1
Former-commit-id: ecd2b21240 [formerly 0df83cd043] [formerly ecd2b21240 [formerly 0df83cd043] [formerly 8a4e1ba3ef [formerly ea5b97f1f606210e70bbf616a0c9158f03f67b5e]]]
Former-commit-id: 8a4e1ba3ef
Former-commit-id: 72718efd19 [formerly 07f0918267]
Former-commit-id: 66aeb50c1b
2014-12-10 08:52:21 -05:00
steve.naples
943bb23d55 ASM #16911 - Fixed issue where Hydrologic date did not advance to next day after 18Z.
Change-Id: Ie26af265d8a233e4fdf6e9dbc1e4ff6934aae4e4

Former-commit-id: 5e5f9bd31a [formerly 42d555b6c9] [formerly 5e5f9bd31a [formerly 42d555b6c9] [formerly 45c3852132 [formerly b2c9cd15e1f02c8272c1d9a9d50e877470b05eb3]]]
Former-commit-id: 45c3852132
Former-commit-id: 171ae9e2af [formerly 601ef7ccfe]
Former-commit-id: b1fba07ae0
2014-12-09 19:04:17 +00:00
steve.naples
7e0d52e06e ASM #16889 - Fixed issue with precip station count, also added logging for Snow data file read and station edit.
Change-Id: I1b689b485a152e1c942c021ac0f778b0f299d3e3

Former-commit-id: fdc62ce4d5 [formerly 18b2de3fdf] [formerly fdc62ce4d5 [formerly 18b2de3fdf] [formerly 539b859040 [formerly c836fb0c1f8721f81049af56cb8f7be9960a5cd6]]]
Former-commit-id: 539b859040
Former-commit-id: bd2e55cc11 [formerly eb7c80f60e]
Former-commit-id: 98fb222468
2014-12-08 15:48:28 +00:00
Steve Harris
de7570535c Merge branch 'master_14.3.1' (14.3.1-36) into omaha_14.3.1
Former-commit-id: b9081f0c0c [formerly b19ae7a6db] [formerly b9081f0c0c [formerly b19ae7a6db] [formerly 12d20a1e6b [formerly e2a6deed98773f943def0ce9d9daf2a6a13f0eda]]]
Former-commit-id: 12d20a1e6b
Former-commit-id: 059b34ff5c [formerly 5c1b170604]
Former-commit-id: 3d3de6d3e7
2014-12-07 23:13:26 -06:00
Steve Harris
0a8e281903 Merge branch 'master_14.3.1' (14.3.1-35) into omaha_14.3.1
Former-commit-id: 94c94fc302 [formerly 55e02e460f] [formerly 94c94fc302 [formerly 55e02e460f] [formerly 6179b233a4 [formerly 28f68f31cbb9b73910fc3623f48b141ba5ba2385]]]
Former-commit-id: 6179b233a4
Former-commit-id: c198f27397 [formerly 3626b87ba3]
Former-commit-id: f0096f6a97
2014-12-03 16:03:42 -06:00
Juliya Dynina
b605a89c50 Merge "ASM #16889 - Fixed colorvalue_use warning and cleaned up some code." into asm_14.3.1
Former-commit-id: d49e57a971 [formerly c431691d06] [formerly d49e57a971 [formerly c431691d06] [formerly 354a421da7 [formerly 2ebcc016732b0405b183b0e4e56d528a24e9cbdf]]]
Former-commit-id: 354a421da7
Former-commit-id: de28a15f08 [formerly 3466788534]
Former-commit-id: c4ba582ff4
2014-12-03 14:40:12 -05:00
steve.naples
872c537dbe ASM #16889 - Fixed colorvalue_use warning and cleaned up some code.
Change-Id: Id9d52cdb328ed7f863f7e09c09ee3e7ef70bf8a4

Former-commit-id: 91c240f8bd [formerly c4fad58bd9] [formerly 91c240f8bd [formerly c4fad58bd9] [formerly b5389ced26 [formerly 862cb7c4d789915067558c4508cf5f1e45a2cdf2]]]
Former-commit-id: b5389ced26
Former-commit-id: ffe6a3d92f [formerly f33429b6f0]
Former-commit-id: 21f7cc1c0d
2014-12-03 18:35:19 +00:00
Brian.Dyke
cc516be6d9 Merge branch 'asm_14.3.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.3.1
Former-commit-id: 5c476c7a35 [formerly 6777dfad30] [formerly 5c476c7a35 [formerly 6777dfad30] [formerly 3b0a70d21e [formerly 5972d08bfe8bc836a3437251bcf9f5e68e14b6a1]]]
Former-commit-id: 3b0a70d21e
Former-commit-id: 4a237f37b1 [formerly e49d1b27b6]
Former-commit-id: ff75ac2290
2014-12-02 12:17:32 -05:00
Paul.Grell
a335d1383c ASM #16911 HydroDate set to next day if hour is 18Z or later
Change-Id: Ied55660cb81e3fdf2e87295fe22eb0915f7b4764

Former-commit-id: 2aecc9933d [formerly 63ae1fe88c] [formerly 2aecc9933d [formerly 63ae1fe88c] [formerly 370466a7e8 [formerly 38d9bc8c4e385e339df5bdd010160728730bed8d]]]
Former-commit-id: 370466a7e8
Former-commit-id: 5269897368 [formerly c6cec6b252]
Former-commit-id: 08f47bfadd
2014-12-02 11:35:28 -05:00
Greg Armendariz
406fe72cfb Merge "Issue #3804 BigNsharp 32 Bit Binary DLL" into omaha_14.3.1
Former-commit-id: 90211f7199 [formerly 2b7718e838] [formerly 90211f7199 [formerly 2b7718e838] [formerly f8d3131a94 [formerly e2ca08db84093060c1b570d7ec0c6d95b37d958c]]]
Former-commit-id: f8d3131a94
Former-commit-id: 8219f59c3f [formerly 638afce469]
Former-commit-id: c0b6bdd172
2014-12-01 08:39:56 -06:00
David Lovely
119b429498 Issue #3804 BigNsharp 32 Bit Binary DLL
Former-commit-id: 48f15f5168 [formerly 96d211ec20] [formerly 48f15f5168 [formerly 96d211ec20] [formerly 7011dcd271 [formerly d4fe863a026c3df816d74ae724276628ab8aa4fb]]]
Former-commit-id: 7011dcd271
Former-commit-id: 7881c0a30b [formerly 06fdbc60d4]
Former-commit-id: 7da92cb2c4
2014-11-26 13:39:22 -06:00
steve.naples
5b67fa0f7c ASM #16889 - Daily QC does not display SNOTEL data.
Change-Id: I42035d5d4d856a395400a1be1d0c6a24bc64b0d8

Former-commit-id: 74aa7ae98b [formerly ec656123f2] [formerly 74aa7ae98b [formerly ec656123f2] [formerly a0face5b02 [formerly 01735909fffdc9b5ef14ed072253eed6deaecad9]]]
Former-commit-id: a0face5b02
Former-commit-id: ffb601d560 [formerly 5845c1d382]
Former-commit-id: 98e2feaf8d
2014-11-26 18:24:53 +00:00
Nate Jensen
cf303fb976 Merge "Issue #3026 - Fix for HPE displays is volume browser" into omaha_14.3.1
Former-commit-id: e4da2244f9 [formerly b46b4b51a8] [formerly e4da2244f9 [formerly b46b4b51a8] [formerly 63c505f357 [formerly 1cf731bc43346810f1976650ad509ee538cf3067]]]
Former-commit-id: 63c505f357
Former-commit-id: e2f2a73ae3 [formerly 102d0e7a29]
Former-commit-id: c99b5a5ae6
2014-11-21 15:46:16 -06:00
Mike Duff
fab77b664b Issue #3026 - Fix for HPE displays is volume browser
Change-Id: I1ef2766e9bf74e7ad82cc36cd4e4a35659aacf39

Former-commit-id: 3ab236aca3 [formerly 67f3b00beb] [formerly 3ab236aca3 [formerly 67f3b00beb] [formerly c1bea3b41f [formerly a375e64e7ee3276be47b26f4386e7bc6491bc740]]]
Former-commit-id: c1bea3b41f
Former-commit-id: 04222b8e43 [formerly 3f0f42a7df]
Former-commit-id: aff7af3377
2014-11-21 13:56:46 -06:00
Roger Ferrel
d310b78363 Issue #3439 Changed id=gfs90 to id=gfs to avoid confusion in these xml files.
Change-Id: I55b44a25196e9dcbc0a5e1417da1c39e5b978f3e

Former-commit-id: 4bcfb3ccaf [formerly 4d06812d30] [formerly 4bcfb3ccaf [formerly 4d06812d30] [formerly 71db8afbaa [formerly a9ce685c99dbdc1442f022cda7af09af5bdabf87]]]
Former-commit-id: 71db8afbaa
Former-commit-id: 1a39fc8b9c [formerly a188c5443b]
Former-commit-id: 77118778ae
2014-11-20 12:25:00 -06:00
Roger Ferrel
4006dd2e2b Issue #3439 Replaced GFS213 with GFS229.
Change-Id: I6cd7774c4897273944c56c39d087bb5cf98f4b15

Former-commit-id: 85d717b49c [formerly 90a8b262f3] [formerly 85d717b49c [formerly 90a8b262f3] [formerly b88300a5fc [formerly 6cb88075375e3703b5ffe559ebd5e4f57d016880]]]
Former-commit-id: b88300a5fc
Former-commit-id: b86d906a5a [formerly 83c738abd9]
Former-commit-id: 6e58de9ef0
2014-11-18 17:42:39 -06:00
Fay.Liang
69898f4fae Merge branch 'asm_14.3.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.3.1
Former-commit-id: 99f1259dda [formerly 82f427924a] [formerly 99f1259dda [formerly 82f427924a] [formerly d666aca2b4 [formerly 3b21d69375ceb9c07377082c5e46a094742406a0]]]
Former-commit-id: d666aca2b4
Former-commit-id: 1d42c33173 [formerly 03a71aa13a]
Former-commit-id: c2cf04d82c
2014-11-14 16:24:25 -05:00
Dave Hladky
1fd60a4db7 Issue #3026 Fixed null metaData lookups in resource.
Change-Id: I29d17ea990ac5516b67ac18fadf4267663a23efb

Former-commit-id: 019739d738 [formerly 3052a38081] [formerly 019739d738 [formerly 3052a38081] [formerly 39db26fb1d [formerly 3f6bba1fda61fe283be47af1a4245d196f94f998]]]
Former-commit-id: 39db26fb1d
Former-commit-id: d58e10f006 [formerly 99e46fdc2c]
Former-commit-id: 1e663936c6
2014-11-11 10:18:47 -06:00
Brian.Dyke
ce5813e8c3 Merge branch 'master_14.3.1' into asm_14.3.1
Former-commit-id: 1cef274675 [formerly 3dff476497] [formerly 1cef274675 [formerly 3dff476497] [formerly 7e87bf7ac4 [formerly b683c7776ef1fad2702fca82aed1abb4873e433b]]]
Former-commit-id: 7e87bf7ac4
Former-commit-id: 26e3e6af8a [formerly 6d74ef5ad8]
Former-commit-id: 93ea188c7c
2014-11-07 12:55:38 -05:00
Brian.Dyke
0c9c29bff8 Merge branch 'omaha_14.3.1' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.3.1
Conflicts:
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/ParmManager.java

Former-commit-id: 43b6c9ff82 [formerly 1cd471ed72] [formerly 43b6c9ff82 [formerly 1cd471ed72] [formerly 1e7d47d2aa [formerly b9d6c75a5c5f4cbe6b1e32f37e044989edf7c39f]]]
Former-commit-id: 1e7d47d2aa
Former-commit-id: f2fad2a476 [formerly 331a06fedb]
Former-commit-id: 66d8327025
2014-11-06 13:14:24 -05:00
Brian.Dyke
f25f4ecb2c Merge branch 'master_14.2.4' into master_14.3.1
Conflicts:
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/ParmManager.java
	cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-common.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/GFESiteActivation.java
	edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/MessageProducer.java
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template

Former-commit-id: 4ac24af0a9 [formerly aae68215c8] [formerly 4ac24af0a9 [formerly aae68215c8] [formerly acf00264f4 [formerly 5c2079dd25181c68f872691e81842aff0f696f8d]]]
Former-commit-id: acf00264f4
Former-commit-id: 2743718323 [formerly 2b470ad1a1]
Former-commit-id: 54f82d7f6f
2014-11-06 12:55:21 -05:00
Steve Harris
4614ea10a5 Merge branch 'master_14.3.1' (14.3.1-31) into omaha_14.3.1
Former-commit-id: 0acbe91e58 [formerly 98f2a877f6] [formerly 0acbe91e58 [formerly 98f2a877f6] [formerly 2ed98bb227 [formerly b70eb5b35985453e77ef2337728c65161ba60422]]]
Former-commit-id: 2ed98bb227
Former-commit-id: 1deef1254f [formerly 585bebbf12]
Former-commit-id: b72af6ee72
2014-11-04 13:05:36 -06:00
Matthew Howard
3cd058379a Merge changes I8e97aec2,Ib6df55db into asm_14.3.1
* changes:
  ASM #16693 changed swear words to all upper case
  ASM #16693 fixed typo in the filter


Former-commit-id: e4fecfd65c [formerly c2226a2817] [formerly e4fecfd65c [formerly c2226a2817] [formerly afc51d425d [formerly 0c3de224e672ea5259eaa395672efdf8982a1d45]]]
Former-commit-id: afc51d425d
Former-commit-id: 4a7966269b [formerly dfffeb2fd3]
Former-commit-id: 79883bc17e
2014-11-04 13:11:10 -05:00
Ron Anderson
6c57033c28 Issue #3775 Fix db does not exist for getParmList() error when runProcedure creates new mutable db.
Change-Id: I28eef61e4eea77278efe3cbf8828c3357c856785

Former-commit-id: af9fd16f73 [formerly b508a7134c] [formerly af9fd16f73 [formerly b508a7134c] [formerly dd230d9f01 [formerly de45da45f39169e3924122a7baf68ab6762e74e2]]]
Former-commit-id: dd230d9f01
Former-commit-id: 3b2b59689b [formerly 47aadc52c1]
Former-commit-id: 023abd756b
2014-11-04 11:03:42 -06:00
Ying-Lian.Shi
ec7a960513 ASM #16693 changed swear words to all upper case
Change-Id: I8e97aec281a3e2c307355a2138bde605de41f446

Former-commit-id: 741357ca4e [formerly 2c2662c191] [formerly 741357ca4e [formerly 2c2662c191] [formerly da58db313c [formerly ae186e99c22beeda347561fe24dc38a61a699c25]]]
Former-commit-id: da58db313c
Former-commit-id: 090de73852 [formerly 4b578495cd]
Former-commit-id: 2ef5007880
2014-11-04 14:13:29 +00:00
Brian.Dyke
2c716cdca3 Merge branch 'omaha_14.3.1' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.3.1
Former-commit-id: e4ce5f5af5 [formerly f3b80f319d] [formerly e4ce5f5af5 [formerly f3b80f319d] [formerly 327491a3a8 [formerly 4be7b001bc98e6fe81b3e66940d025fd7511060b]]]
Former-commit-id: 327491a3a8
Former-commit-id: 4b47c8a5b8 [formerly 196e5e37ac]
Former-commit-id: 319b2f9b15
2014-11-03 14:45:24 -05:00
Matthew Howard
2868a0bf5a Merge "ASM #16693 handles more swear words" into asm_14.3.1
Former-commit-id: 921bd882fa [formerly 36e73a31df] [formerly 921bd882fa [formerly 36e73a31df] [formerly 39ed75df43 [formerly a6ed07b8c01df8576cc54f88dc52d2110d211707]]]
Former-commit-id: 39ed75df43
Former-commit-id: 5fc103daf4 [formerly d90db01d4e]
Former-commit-id: c4fc8042ba
2014-11-03 09:56:09 -05:00
Ying-Lian.Shi
16e67d74b3 ASM #16693 fixed typo in the filter
Change-Id: Ib6df55dbaabdbebe8bb670fbffd9c4c901e31857

Former-commit-id: 66ffae1502 [formerly 12ccfcfa11] [formerly 66ffae1502 [formerly 12ccfcfa11] [formerly 004b6fb906 [formerly 29f50282d5e2415f1d9a876c5515be0c04e27015]]]
Former-commit-id: 004b6fb906
Former-commit-id: d3f52b327e [formerly 9d4e4a1143]
Former-commit-id: 31d7a25345
2014-10-31 10:57:55 +00:00
Brian.Dyke
79070ce122 Merge branch 'master_14.2.3' into master_14.2.4
Former-commit-id: ce4a1c042f [formerly 5e04756c0c] [formerly ce4a1c042f [formerly 5e04756c0c] [formerly 0f8e11aad4 [formerly 78923886791099b8e4564dd780d8ed64db16a5c1]]]
Former-commit-id: 0f8e11aad4
Former-commit-id: 6907e0d17b [formerly 6c13091ec2]
Former-commit-id: 189db02dfe
2014-10-30 15:03:19 -04:00
Ying-Lian.Shi
bef4398770 ASM #16693 handles more swear words
Change-Id: I0b892e3e6748919a206597106604a50f108b1bf7

Former-commit-id: e592171fe2 [formerly ea9e231074] [formerly e592171fe2 [formerly ea9e231074] [formerly 3d9fa4e763 [formerly 6133c233bd3e02b0a8e1540dd6c496997184f11d]]]
Former-commit-id: 3d9fa4e763
Former-commit-id: 49aafc099b [formerly c8cfe6a2a7]
Former-commit-id: a9d2b2aa5a
2014-10-30 18:22:34 +00:00
Ron Anderson
f3069463b5 Issue #3776 Cache SWT fill patterns used in history mode.
Change-Id: Ibb48a997fd0b9c2308ae9f492c7837a10db7285d

Former-commit-id: 8f220702f9 [formerly 0c3e19449f] [formerly 8f220702f9 [formerly 0c3e19449f] [formerly 53144f55f0 [formerly baefc78796f3d4826d32e5324dd88fa01d242ed5]]]
Former-commit-id: 53144f55f0
Former-commit-id: e946ac633e [formerly 5f83ca27f1]
Former-commit-id: 5a57491701
2014-10-29 15:20:18 -05:00
Steve Harris
cbe613818b Merge branch 'master_14.3.1' (14.3.1-29) into omaha_14.3.1
Former-commit-id: 9646f78f5d [formerly 1753861b41] [formerly 9646f78f5d [formerly 1753861b41] [formerly 15d91d4b2d [formerly 9d95570c1686978a5c84a21af29dbc84e53355a3]]]
Former-commit-id: 15d91d4b2d
Former-commit-id: 51175a1556 [formerly 2a46e1a813]
Former-commit-id: e9b43ad7b6
2014-10-29 08:21:13 -05:00
Ben Steffensmeier
e74823bc2d Issue #3767 Change default image export name to screenCapture.png.
Former-commit-id: 4e24cde257 [formerly 1591c9cbb8] [formerly 4e24cde257 [formerly 1591c9cbb8] [formerly 80c209fef7 [formerly 021367d3212e185a2d8d4e5970fc268204bf070b]]]
Former-commit-id: 80c209fef7
Former-commit-id: 89194b9816 [formerly 14dbd71e9d]
Former-commit-id: 101c92c99c
2014-10-28 14:18:02 -05:00
Matthew Howard
c95af0262e Merge "ASM #16863 - GFE: Check in version 2.12 of the Objective Analysis utility" into asm_14.3.1
Former-commit-id: 56dc0eb99f [formerly f1d793c8f5] [formerly 56dc0eb99f [formerly f1d793c8f5] [formerly 4b542e6e5b [formerly aa43d958820f8873a982d24d9c73760eb430ddc7]]]
Former-commit-id: 4b542e6e5b
Former-commit-id: 09162268b9 [formerly 92d4322bf4]
Former-commit-id: eb8961b4e2
2014-10-24 10:06:56 -05:00
Rici.Yu
a4d0114a0a ASM #16863 - GFE: Check in version 2.12 of the Objective Analysis utility
Change-Id: Ia377d571db68d0078399460ad1d434ba4dad510b

Former-commit-id: 28294702a5 [formerly 45e3b2895b] [formerly 28294702a5 [formerly 45e3b2895b] [formerly b9269162a6 [formerly 902d1b1e4fed90ff216eab2ee5fc3f198bf7fc6d]]]
Former-commit-id: b9269162a6
Former-commit-id: 7de71523c3 [formerly c65088c5da]
Former-commit-id: 66189dcad2
2014-10-24 10:54:37 -04:00
Shawn.Hooper
dd3d444885 ASM #16871 - Checkin: MPE Gage Table: columns do not sort in descending order
Change-Id: I197c3049e39ad0c5f5edca8926ff1afdaca20e2f

Former-commit-id: 1c025e7a9d [formerly 7a7d877c17] [formerly 1c025e7a9d [formerly 7a7d877c17] [formerly f5b9798c3d [formerly ce7ade3d25263f5af09073e4877b018a84f195a3]]]
Former-commit-id: f5b9798c3d
Former-commit-id: 0510185ff8 [formerly 154ad67a31]
Former-commit-id: f66225d338
2014-10-24 09:47:54 -04:00
Rici.Yu
aca44fc590 ASM #16858 - Check in SerpISC tool.
Change-Id: I4c15360c377370bd757ed2eaad7aeade49412fd6

Former-commit-id: 51adc6a204 [formerly 9c2555466c] [formerly 51adc6a204 [formerly 9c2555466c] [formerly 6958f11ea7 [formerly 1e8961e4f4a8168b667ce4b689efd88157dfb61c]]]
Former-commit-id: 6958f11ea7
Former-commit-id: f069fa1fea [formerly 5c22571568]
Former-commit-id: c502ac8d82
2014-10-20 14:39:46 -04:00
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
Ron Anderson
2b0b7ba3e3 Issue #3684 Fix GFE notification sending
Change-Id: I3b2ab7f454cb9454a9827ef994002d1b2348f462

Former-commit-id: 95b1633c25 [formerly c7bf818989] [formerly 95b1633c25 [formerly c7bf818989] [formerly 5368107615 [formerly b538cd55c0662d3d593522817986109c7e03625a]]]
Former-commit-id: 5368107615
Former-commit-id: df266c342f [formerly a65682953c]
Former-commit-id: eb776bb033
2014-10-09 09:21:29 -05: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