Commit graph

6353 commits

Author SHA1 Message Date
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
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
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
Shawn.Hooper
7ab9b05ef8 ASM #15033 - Allow generic warning types to show up continuously during Warning cycle
Change-Id: I6e0884b1bbc1e4bed3300bb9dc0f0b3f779aa212

Former-commit-id: a9b50b13ce [formerly 58db54ff05] [formerly a9b50b13ce [formerly 58db54ff05] [formerly f8ee619f16 [formerly 41e18e5104eac8ee3335a80d678d74c7a56b196a]]]
Former-commit-id: f8ee619f16
Former-commit-id: bd94e0808a [formerly c4f4477a7c]
Former-commit-id: 2d012e4a7e
2014-11-03 10:30:05 -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
Brian.Dyke
871cb67e3b Merge branch 'asm_14.2.4' of winter:/data/gerrit2/git/AWIPS2_baseline into master_14.2.4
Former-commit-id: 6f57efd2cb [formerly affc9ed976] [formerly 6f57efd2cb [formerly affc9ed976] [formerly 186f587dd6 [formerly ef112c1ff84f846dbe7093bcbb4a94fecf2274d5]]]
Former-commit-id: 186f587dd6
Former-commit-id: 3451202fb4 [formerly 2b7ad1daec]
Former-commit-id: b7b16413cd
2014-10-30 15:05:39 -04: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
Shawn.Hooper
87c2032935 ASM #16800 - Add HRRR under D2D in Weather Element Browser
Change-Id: I829cd7357ccd37e389e88567a4159d0efde9aa41

Former-commit-id: 733d5ff94d [formerly a44d775a27] [formerly 733d5ff94d [formerly a44d775a27] [formerly ec3b831987 [formerly 99807ddc4810c08635d5462357dc29e661686e33]]]
Former-commit-id: ec3b831987
Former-commit-id: 3af096ae41 [formerly 2f2bb733a4]
Former-commit-id: 027364c2f9
2014-10-30 14:47:26 -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
Shawn.Hooper
bd561efdaa ASM #16805 - Increment release number in the awips2-tools rpm spec file
Change-Id: I5ab390facd2343fdcbc9d2f374d275d9ef466aa4

Former-commit-id: c715bdd83a [formerly 285e4baaec] [formerly c715bdd83a [formerly 285e4baaec] [formerly 9332029a6d [formerly 80801f18a7106c3a7b0dca626fbaca4ec5a67f7f]]]
Former-commit-id: 9332029a6d
Former-commit-id: 01ba6f2df0 [formerly 0b0b922968]
Former-commit-id: 017fd9461d
2014-10-30 09:58:02 -04:00
Brian.Dyke
048d3afc21 Merge branch 'master_14.3.1' into asm_14.3.1
Former-commit-id: 7e526df351 [formerly 33522c2b74] [formerly 7e526df351 [formerly 33522c2b74] [formerly bdd4f6b3cc [formerly 5d2ba108dfbe266edbaee8f5a03e81c02419997a]]]
Former-commit-id: bdd4f6b3cc
Former-commit-id: 752395b827 [formerly e3ebd14d63]
Former-commit-id: fad768b8a7
2014-10-30 09:38:07 -04:00
Steve Harris
cd0ab9839f Merge branch 'master_14.3.1' (14.3.1-30) into omaha_14.3.1
Former-commit-id: 4bca05c4e0 [formerly 8fd7a28033] [formerly 4bca05c4e0 [formerly 8fd7a28033] [formerly 8d1829bee7 [formerly ec350c044862fb51513ffa5246c47af33a6ceae5]]]
Former-commit-id: 8d1829bee7
Former-commit-id: a4314b292f [formerly 8a6a57d9de]
Former-commit-id: 65f75f0463
2014-10-30 08:36:12 -05: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
Brian.Dyke
c5da475ca8 Merge branch 'ops_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: 77b206664f [formerly 9907c37a0e] [formerly 77b206664f [formerly 9907c37a0e] [formerly 94ddd59bfc [formerly d12d6cf7e6862a87c00f833ee02e72e5c0ad8252]]]
Former-commit-id: 94ddd59bfc
Former-commit-id: 19eeee8c30 [formerly b396cc467c]
Former-commit-id: 1c28509975
2014-10-28 15:25:05 -04:00
Brian.Dyke
f866615c4b Merge branch 'ops_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Conflicts:
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/VM_global_library.vm

Former-commit-id: fe00e65407 [formerly f8ce701c85] [formerly fe00e65407 [formerly f8ce701c85] [formerly 765359aee6 [formerly 52ba693c7d77f4e29db6bc5202c9764509bce58d]]]
Former-commit-id: 765359aee6
Former-commit-id: 972a6e517c [formerly 957781a1b2]
Former-commit-id: 50861065c3
2014-10-28 15:23:11 -04: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
Baoyu Yin
bc77150d28 VLab Issue #4796 - AWIPS2_DR_17420 WarnGen templates and 14.2.1 template corrections UPDATE on Oct 28 fix for FFW error ; fixes #4796
Change-Id: I4f43f1365c3ad4d11314f199c4d896aa542a48c0

Former-commit-id: 3481a6eee5 [formerly c9bc14a668] [formerly 3481a6eee5 [formerly c9bc14a668] [formerly 4252ccfcb1 [formerly 54d2f956f53d2fe8a6fa0550a4236d95013b8ba8]]]
Former-commit-id: 4252ccfcb1
Former-commit-id: 0cfd20d2ae [formerly 8f9c70f4f7]
Former-commit-id: 6591ced510
2014-10-28 14:32:31 -04:00
Ron Anderson
17da4b56c3 Issue #3766 Fixed return type of GridParmManager.createNewDb
Change-Id: Ib76bf614b09895ef08065da86d3af8d59f490f4c

Former-commit-id: c8ff5af7b6 [formerly ebe43e22d3] [formerly c8ff5af7b6 [formerly ebe43e22d3] [formerly 8362946f0e [formerly 2e2f83952a6ef00b17d9f4504133c85e93e0126e]]]
Former-commit-id: 8362946f0e
Former-commit-id: 63f599abc8 [formerly 673344e596]
Former-commit-id: 97163fbb67
2014-10-27 18:40:15 -05:00
Brian.Dyke
f2ae5211fa Merge branch 'master_14.3.1' into asm_14.3.1
Former-commit-id: a40f672610 [formerly 34931f4cc5] [formerly a40f672610 [formerly 34931f4cc5] [formerly 1ac5b6af5d [formerly cca25d0e29324cc883f177597e0975279b07c8ca]]]
Former-commit-id: 1ac5b6af5d
Former-commit-id: 18910139f9 [formerly 34a01a98da]
Former-commit-id: 17fe6047f4
2014-10-27 15:51:57 -04:00
Baoyu Yin
3fc23993de VLab Issue #4796 - AWIPS2_DR_17420 WarnGen templates and 14.2.1 template corrections UPDATE on Oct 27 ; fixes #4796
Change-Id: I636b0cbb46b31f46cb2d017a4b3047108c98f0c9

Former-commit-id: cc1bf99ad3 [formerly 2c0c42dcdd] [formerly cc1bf99ad3 [formerly 2c0c42dcdd] [formerly bb89f99643 [formerly b447742f498bceaf5f522a637d6ae501f80dfa23]]]
Former-commit-id: bb89f99643
Former-commit-id: 35c673732c [formerly f64eb6adb4]
Former-commit-id: f280be43f7
2014-10-27 10:15:39 -04:00
Brian.Dyke
8aa756abcd Merge branch 'master_14.3.1' into asm_14.3.1
Former-commit-id: b6a8a77a57 [formerly dfeeca0087] [formerly b6a8a77a57 [formerly dfeeca0087] [formerly 2aa72b21eb [formerly 053e63233a482aced6365a02adef9fda77ee7116]]]
Former-commit-id: 2aa72b21eb
Former-commit-id: 7b689c5df1 [formerly 41b03d1bca]
Former-commit-id: 41da20e500
2014-10-24 14:56:38 -04:00
Baoyu Yin
1104d42ecc VLab Issue #4796 - AWIPS2_DR_17420 WarnGen templates and 14.2.1 template corrections UPDATE on Oct 24 ; fixes #4796
Change-Id: I2df1ea83b9cd17735ee835914febd3739ff4671d

Former-commit-id: e0b0edd8e1 [formerly c1d51b3588] [formerly e0b0edd8e1 [formerly c1d51b3588] [formerly fe574dd41d [formerly ecc2b0c99a4e849b9472dd6c0cd63416e880d4cb]]]
Former-commit-id: fe574dd41d
Former-commit-id: d9a5a45bb7 [formerly 377c4ba8e5]
Former-commit-id: c845fff8cd
2014-10-24 14:28:08 -04:00
Brian.Dyke
28a3ea814c Merge branch 'ncep_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: 77f518abc1 [formerly dc0810a926] [formerly 77f518abc1 [formerly dc0810a926] [formerly 9a5d1450b2 [formerly 546badba2c4dceb628b248d980baf571c6f44944]]]
Former-commit-id: 9a5d1450b2
Former-commit-id: 2932058e2c [formerly 7b395d423f]
Former-commit-id: edbd3df9b1
2014-10-24 14:01:28 -04:00
Brian.Dyke
08a9818e6c Merge branch 'asm_14.3.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.3.1
Former-commit-id: 3f983ee440 [formerly 382bf468ef] [formerly 3f983ee440 [formerly 382bf468ef] [formerly 7bbaafabaa [formerly 46ab2183dfeb66020368e7d079f59f21e31c37eb]]]
Former-commit-id: 7bbaafabaa
Former-commit-id: 1a409740cf [formerly 8aebfda90f]
Former-commit-id: c55d15cdeb
2014-10-24 13:57:32 -04:00
Shawn.Hooper
25f3cf027d ASM #533 - Add delta script for 14.3.1 to delete FSS Obs Config Files
Change-Id: Id3c5cd06222eb62d50588c03f9d0ea6667883011

Former-commit-id: 3e833a488b [formerly ba89dbce5c] [formerly 3e833a488b [formerly ba89dbce5c] [formerly e83e14dcb1 [formerly 040665f65dead38fed0e4ca6176b422c8e6c9f1b]]]
Former-commit-id: e83e14dcb1
Former-commit-id: f133c3e7e2 [formerly cd71b1c4e2]
Former-commit-id: dbd5fb05f4
2014-10-24 13:06:29 -04: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
Stephen Gilbert
180ddf797a VLab Issue #5064 - Compare and Edit functions not working in SHARP(D2D);
fixes #5064

Change-Id: I3c9bf22b767dbc67fa70291989c694d39945d112

Former-commit-id: 373ecc99e4 [formerly c94b2187f6] [formerly 373ecc99e4 [formerly c94b2187f6] [formerly 302779155f [formerly ee20131811fba389f001870d3274b32adfee3f28]]]
Former-commit-id: 302779155f
Former-commit-id: c0e2c341da [formerly db0806d9a4]
Former-commit-id: 6847f15b25
2014-10-23 12:36:30 -04:00
Stephen Gilbert
3e311009ba VLab Issue #5063 - NSHARP(D2D) does not load using Volume Browser; fixes
#5063

Change-Id: Idd83363e5235868939c2251239264eb73863efb7

Former-commit-id: 0181780c3c [formerly 97bd608624] [formerly 0181780c3c [formerly 97bd608624] [formerly 5e1e9f6f58 [formerly b59616510517bf52d23edaf055e9d4a53b26e2dc]]]
Former-commit-id: 5e1e9f6f58
Former-commit-id: 5ef5b5733a [formerly 604d44817f]
Former-commit-id: 0a03032bbe
2014-10-23 12:33:50 -04:00
Brian.Dyke
ddb3a6fc97 Merge branch 'asm_14.3.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.3.1
Former-commit-id: 564db5cd87 [formerly 9199e8b072] [formerly 564db5cd87 [formerly 9199e8b072] [formerly 268f76df74 [formerly 97623c832e9ba336959d6f4f11045ec9738657eb]]]
Former-commit-id: 268f76df74
Former-commit-id: ef08117a63 [formerly b1608227ef]
Former-commit-id: e7fef28b20
2014-10-22 14:51:41 -04:00
Shawn.Hooper
ed790d1a7a ASM #16805 - Removed references to obsolete license.txt file and renamed Master_Rights_file.pdf
Change-Id: I2b3a021440c834df3505ed11a2883f0fb214a868

Former-commit-id: 114ff128ed [formerly 0e372cd13e] [formerly 114ff128ed [formerly 0e372cd13e] [formerly 3b4b9d262a [formerly e29cf5a57591e5a25b6e73b267c0abb46e9f95c2]]]
Former-commit-id: 3b4b9d262a
Former-commit-id: b1426303fa [formerly d62f27cae6]
Former-commit-id: cc74b6bb2c
2014-10-22 14:47:42 -04:00
Brian.Dyke
9b06c9038c Merge branch 'asm_14.3.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.3.1
Former-commit-id: 975f877994 [formerly 9bcc6bb52e] [formerly 975f877994 [formerly 9bcc6bb52e] [formerly abb4203634 [formerly c8cd8594507148284ac3ec2283fcc9e152c532a6]]]
Former-commit-id: abb4203634
Former-commit-id: a16d6c944f [formerly 40717fa44c]
Former-commit-id: 06f41040c2
2014-10-22 10:39:36 -04:00
Shawn.Hooper
2b594e3be8 Merge "ASM #13467 - Update GenericHazards.py for Shannon" into asm_14.3.1
Former-commit-id: d998d23eb4 [formerly 4e0cb152d2] [formerly d998d23eb4 [formerly 4e0cb152d2] [formerly 92204e05a1 [formerly 4bbcf01f8a3abf038f3183c5872bc8f9f12624a1]]]
Former-commit-id: 92204e05a1
Former-commit-id: 86d953da5c [formerly f1841b5042]
Former-commit-id: a531fdfa56
2014-10-21 10:35:01 -05:00
Shawn.Hooper
490cb64a41 ASM #16805 - Fix rpms/legal/ directory
Change-Id: I369e4d5423c760bf689180239f15cfd363a202b3

Former-commit-id: 26054621ca [formerly d0fba5965b] [formerly 26054621ca [formerly d0fba5965b] [formerly a96693cb70 [formerly 94872b496bec6c427030ea353856466809d2e6c1]]]
Former-commit-id: a96693cb70
Former-commit-id: 78cd702d20 [formerly f98e05c9de]
Former-commit-id: b99895779f
2014-10-21 11:17:45 -04:00
Shawn.Hooper
67d5d621ed ASM #13467 - Update GenericHazards.py for Shannon
Change-Id: Ic1131929aa14f97cff0e1cf92e30c338470f368e

Former-commit-id: 700bc0691c [formerly 4d81023184] [formerly 700bc0691c [formerly 4d81023184] [formerly ddeec493c3 [formerly f4e8f7493bbfb025e8040f7663dc582414a87413]]]
Former-commit-id: ddeec493c3
Former-commit-id: 115a9c1fd9 [formerly f1feaee0ea]
Former-commit-id: 2d96f0e149
2014-10-21 11:11:34 -04:00
Matthew Howard
f2364ce437 Merge "ASM #16858 - Check in SerpISC tool." into asm_14.3.1
Former-commit-id: cf3afaf2bb [formerly 8827f5e49c] [formerly cf3afaf2bb [formerly 8827f5e49c] [formerly 587cf1b66e [formerly 4a965632119a9349cf320125b97db52498a760c8]]]
Former-commit-id: 587cf1b66e
Former-commit-id: 31e1eaf1cf [formerly 612cf99edb]
Former-commit-id: 30c0cf769c
2014-10-20 13:56:06 -05: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
Shawn.Hooper
82afe46187 ASM #16805 - Update master rights and license files for 14.3.1.
Change-Id: Ifb5b67010a01dfa9805e64d408f5688d10d7bf82

Former-commit-id: 217f39ee04 [formerly e24cb3c37e] [formerly 217f39ee04 [formerly e24cb3c37e] [formerly 65065f2380 [formerly f72ec046e98bdb6734dbce10ef472dd5294c59ba]]]
Former-commit-id: 65065f2380
Former-commit-id: c491bf611e [formerly e50becc648]
Former-commit-id: 17f88aad75
2014-10-20 14:36:31 -04:00
Slav Korolev
be8e3fb6b2 Issue #2757 - Fixed a problem with duplicate zones.
Former-commit-id: bde08f6c38 [formerly 0d4ed62be4] [formerly bde08f6c38 [formerly 0d4ed62be4] [formerly 079b74d69c [formerly 8929c542c33090555dd9db16113453e1000c6e5b]]]
Former-commit-id: 079b74d69c
Former-commit-id: 7df98880af [formerly 7555a3be9d]
Former-commit-id: a3f162adfe
2014-10-20 13:08:44 -04:00
Dave Hladky
c5924c5c82 Issue #3736 Allow shared subscriptions to have adhocs
Change-Id: I2379ac2cd1f02b36587531b448b8c3e6434664f9

Former-commit-id: 8a4711aa8d [formerly 19840e43f3] [formerly 8a4711aa8d [formerly 19840e43f3] [formerly 5cde2fa48c [formerly a5a2b995e5dd4a7af165f62496d8052ed43d23b4]]]
Former-commit-id: 5cde2fa48c
Former-commit-id: 029a0dd15a [formerly 87ae74320e]
Former-commit-id: b860f286d3
2014-10-20 08:58:08 -05:00
Nate Jensen
d0eeb1113f Merge "Issue #3707 Reworked gridded subscription triggereing for retrievals. Change-Id: I4abded9b531c7b7e9b9058760b97b8f5e778d176" into omaha_14.3.1
Former-commit-id: 68e1e93532 [formerly dcce72b823] [formerly 68e1e93532 [formerly dcce72b823] [formerly cfb24faf68 [formerly 57848f31cc73d81d16595e4e5b01949bcff12a24]]]
Former-commit-id: cfb24faf68
Former-commit-id: 8ab9c456da [formerly 6593a843e4]
Former-commit-id: c73551e8ac
2014-10-20 08:37:41 -05:00
Dave Hladky
16b8183169 Issue #3707 Reworked gridded subscription triggereing for retrievals.
Change-Id: I4abded9b531c7b7e9b9058760b97b8f5e778d176

Former-commit-id: 468276afdd [formerly a3268ae60d] [formerly 468276afdd [formerly a3268ae60d] [formerly c7df290186 [formerly eb64bd232cd25a71dbac655f4d59f9ec10b841b4]]]
Former-commit-id: c7df290186
Former-commit-id: 55c5454bd5 [formerly 54e397a561]
Former-commit-id: 04aa204dc1
2014-10-17 16:01:47 -05:00
Brian.Dyke
70568c04be Merge branch 'asm_14.3.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.3.1
Former-commit-id: 498abd3716 [formerly 418894a17b] [formerly 498abd3716 [formerly 418894a17b] [formerly 93df82ac92 [formerly f0f79fb324665245ef759947d24514a6c8bc4470]]]
Former-commit-id: 93df82ac92
Former-commit-id: bde528063d [formerly 8af5c9870e]
Former-commit-id: a71dcd88c4
2014-10-16 12:04:27 -04:00
Sean.Webb
e42e731341 ASM #16827 - Added 6th channel configuration, and change logrotate to handle goes_add.log
Change-Id: I2012ac01d51ed11c077d06b638ede4b990bce5cd

Former-commit-id: b256e04c45 [formerly 36d39be5fd] [formerly b256e04c45 [formerly 36d39be5fd] [formerly 5f6c9bc837 [formerly c11e78b57bca7d242d4d8c29dc51669d7aebb37d]]]
Former-commit-id: 5f6c9bc837
Former-commit-id: cbdb5b8911 [formerly 1cbbc5bd59]
Former-commit-id: 8755e96919
2014-10-16 10:38:14 -05:00
Shawn.Hooper
a95b84344a ASM #13467 - Fix for GFE: Need to add Beach Hazards Statement
Change-Id: I9d19a76afff8e4c36db20aec15b997eefc260209

Former-commit-id: ee70a6a4bd [formerly eafaf01966] [formerly ee70a6a4bd [formerly eafaf01966] [formerly 118f34bbf1 [formerly 366c7c478c6d83f8d21e3b30cc664a32cabf08bd]]]
Former-commit-id: 118f34bbf1
Former-commit-id: 08ec650f2f [formerly cd6be50dd6]
Former-commit-id: 156edc445f
2014-10-16 11:30:29 -04:00
Brian.Dyke
61ffee9e3a Merge branch 'mdl_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: 7f719d0124 [formerly c60124fa61] [formerly 7f719d0124 [formerly c60124fa61] [formerly 0d5f2c0add [formerly ea0a81b12c7b1a0154361d97882ef65fc55b20e1]]]
Former-commit-id: 0d5f2c0add
Former-commit-id: a68d796d0f [formerly e44ba36b9b]
Former-commit-id: bcc0a9529f
2014-10-16 11:21:39 -04:00