Commit graph

5069 commits

Author SHA1 Message Date
Brian.Dyke
116aa56b02 Merge branch 'asm_14.2.3' of winter:/data/gerrit2/git/AWIPS2_baseline into master_14.2.3
Former-commit-id: 15381f5e9f [formerly 7b7ef56b04] [formerly 15381f5e9f [formerly 7b7ef56b04] [formerly a610fe6475 [formerly a77577595da1e2dcc8057c5a8b8643a612780339]]]
Former-commit-id: a610fe6475
Former-commit-id: f3b51b9187 [formerly e64fe3875e]
Former-commit-id: a8f49dd627
2014-09-04 15:59:00 -04:00
Brian.Dyke
d6ef2b6737 Merge branch 'master_14.2.2' into master_14.2.3
Former-commit-id: c586c26447 [formerly e762271240] [formerly c586c26447 [formerly e762271240] [formerly e5227e90de [formerly ad120a9357402fbdedb350cabe88d2becf5d7361]]]
Former-commit-id: e5227e90de
Former-commit-id: 1ee7743b8b [formerly c48196cd33]
Former-commit-id: 108d0bfc77
2014-09-04 14:18:34 -04:00
Qinglu.Lin
ec9b3fa971 ASM #15551 - WarnGen: only WCN should be used while including TOR/SVR watches in WarnGen products
Change-Id: I0438af111b0db290373c7553006002edec2b2110

Former-commit-id: 62bcefb9e1 [formerly 8c28597210] [formerly 62bcefb9e1 [formerly 8c28597210] [formerly 902b6c55bd [formerly 33adaf353c6a4b7dc418dc86428257dae260c4c5]]]
Former-commit-id: 902b6c55bd
Former-commit-id: 920b6bb53b [formerly 9c67b89df7]
Former-commit-id: c746dbabad
2014-09-04 14:09:24 -04:00
Brian.Dyke
06a516d948 Merge branch 'omaha_14.2.2' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.2.2
Former-commit-id: 2b613a26fd [formerly 72e2882496] [formerly 2b613a26fd [formerly 72e2882496] [formerly 9e94c2c571 [formerly 2c4c1a5babcfdcfadeb042a190bc79c7973e1a36]]]
Former-commit-id: 9e94c2c571
Former-commit-id: 6d69d0678c [formerly 5a1fa755f9]
Former-commit-id: 1c871eaf3d
2014-09-04 14:01:26 -04:00
Nate Jensen
680fa77b9d Issue #3574 Properly dispose radar graphics graphics objects.
Change-Id: Ica8c630325bada6fd508eeb6b1b4d881a5169320

Former-commit-id: a1bccdc57f [formerly 2cfbfc1dc4] [formerly a1bccdc57f [formerly 2cfbfc1dc4] [formerly 87d507313b [formerly 78172a4ac0b9ece26cdc07da3a8f9a70bbc11782]]]
Former-commit-id: 87d507313b
Former-commit-id: 6d47c3c987 [formerly b1619c055a]
Former-commit-id: 0e6c455b42
2014-09-04 10:10:37 -05:00
Brian.Dyke
fcb029505a Merge branch 'master_14.2.2' into master_14.2.3
Former-commit-id: fa6b302ab6 [formerly 043a95d35e] [formerly fa6b302ab6 [formerly 043a95d35e] [formerly d695dd0084 [formerly 3385f2bc24dfb42e82f9e3451cd44da8dfb89e9a]]]
Former-commit-id: d695dd0084
Former-commit-id: 947d137798 [formerly 62a70ef5ca]
Former-commit-id: fff0709c92
2014-09-03 21:14:27 -04:00
Brian.Dyke
7bc9c15a9e ASM #15697 - Fix Hydro Perspective Issue
Former-commit-id: 3ddb5831a0 [formerly 121a2d100f] [formerly 3ddb5831a0 [formerly 121a2d100f] [formerly cfe03adff6 [formerly 82d7bbe6bf005e543e1ad6772c6a18024f1b0764]]]
Former-commit-id: cfe03adff6
Former-commit-id: 50858cac9f [formerly e8a85da57a]
Former-commit-id: 7f1e3b0ead
2014-09-03 21:10:16 -04:00
Brian.Dyke
cd6bf05d34 Merge branch 'master_14.2.2' into master_14.2.3
Former-commit-id: 65f8fc89f0 [formerly 368f80f220] [formerly 65f8fc89f0 [formerly 368f80f220] [formerly b1dbaa0b50 [formerly f9daf7d6e906904e96438fabc510e24ff66536d4]]]
Former-commit-id: b1dbaa0b50
Former-commit-id: 045647bb37 [formerly a1889cd15e]
Former-commit-id: efb7dcb397
2014-09-02 15:09:06 -04:00
Qinglu.Lin
7ec0ec8877 ASM #15551 - WarnGen: only WCN should be used while including TOR/SVR watches in WarnGen products
Change-Id: I286bc4cc809fcc9257f72051f1bb74f8acc24c05

Former-commit-id: b32ea40289 [formerly 2374673f8d] [formerly b32ea40289 [formerly 2374673f8d] [formerly ae13ea419e [formerly 59890eef397f3282ef26f259ca85ffea3db7b710]]]
Former-commit-id: ae13ea419e
Former-commit-id: 3fcdc279ea [formerly 075df9d234]
Former-commit-id: 415af39911
2014-09-02 14:37:19 -04:00
Steve Harris
3806bd14eb Merge branch 'master_14.2.2' (14.2.2-31) into omaha_14.2.2
Former-commit-id: 142f1bff66 [formerly db74dc031e] [formerly 142f1bff66 [formerly db74dc031e] [formerly 425e8243f2 [formerly 80f0a6df2aeaffce0a58119ae4c3558c7fd08f21]]]
Former-commit-id: 425e8243f2
Former-commit-id: 5f0e7e3581 [formerly 6563187041]
Former-commit-id: f72eb20900
2014-09-02 08:09:48 -05:00
Juliya Dynina
95f1799dc6 Merge "ASM #15682 - D-2D: SPC Watches display: Watches do not disappear when expired" into asm_14.2.3
Former-commit-id: 5f001b7ad7 [formerly 169dc0ba43] [formerly 5f001b7ad7 [formerly 169dc0ba43] [formerly 58a3df78a8 [formerly bb260c4003b477ca51cf5fd9c8d54275af906772]]]
Former-commit-id: 58a3df78a8
Former-commit-id: 62d2e61a75 [formerly 07b6109b5f]
Former-commit-id: 9a5eb28213
2014-08-28 15:52:11 -05:00
David Friedman
e42ffa0ad4 ASM #15682 - D-2D: SPC Watches display: Watches do not disappear when expired
Change-Id: I3a29b5b0bb5c75dd5ac5f508391f5806cabf47fa

Former-commit-id: 9c2545ed64 [formerly de6e79f9e3] [formerly 9c2545ed64 [formerly de6e79f9e3] [formerly d5c086a022 [formerly aca832a81bc18d954eadb51755ce04597cd264df]]]
Former-commit-id: d5c086a022
Former-commit-id: b2cc41f3de [formerly 6209bbc36f]
Former-commit-id: 41b4886743
2014-08-28 18:08:23 +00:00
Daniel.Huffman
ff850b4cf0 ASM #16715 - Reverted and augmented Airports.xml and Fix.xml
Change-Id: Icd15e1947ec7d71b22d621b452d9e1c74767898e

Former-commit-id: c3731d5622 [formerly c89a7169b0] [formerly c3731d5622 [formerly c89a7169b0] [formerly ca2aa8811b [formerly 09e0b79b25ec4f8854dde331469b0e7d6c4ffa1f]]]
Former-commit-id: ca2aa8811b
Former-commit-id: eb9b743c46 [formerly dc2bc16bcc]
Former-commit-id: b97ea429c3
2014-08-28 17:20:30 +00:00
David Friedman
39c7024668 ASM #15658 - WarnGen: inclusion of watch information in marine products
Change-Id: I9f99e6136027f1a6419800f87e5a5709fe5be6b9

Former-commit-id: ea1e9feb1d [formerly a2dfe8e8f6] [formerly ea1e9feb1d [formerly a2dfe8e8f6] [formerly ea9230b37c [formerly 6bfa1d6662b00925814be7126592bbe340651649]]]
Former-commit-id: ea9230b37c
Former-commit-id: 10114b0bd1 [formerly bc22f7309c]
Former-commit-id: bfc3fa98b4
2014-08-28 15:43:32 +00:00
Steve Harris
02c026ccce Merge branch 'master_14.2.2' (14.2.2-30) into omaha_14.2.2
Former-commit-id: 080a50d28c [formerly 891019aadd] [formerly 080a50d28c [formerly 891019aadd] [formerly d3b18900b3 [formerly 579781387325a36e27135b8384b2a8b14cb38317]]]
Former-commit-id: d3b18900b3
Former-commit-id: 60d5eec1b0 [formerly 683c32dc70]
Former-commit-id: 3efff5ee42
2014-08-27 11:34:06 -05:00
Daniel.Huffman
8c6fd18ece ASM #16715 - Reverted and augmented Cities.xml
Change-Id: Ib83fab6854b68f11b72ef41104805b3f1431b8f0

Former-commit-id: e2e132e7a5 [formerly 8962a069be] [formerly e2e132e7a5 [formerly 8962a069be] [formerly d1cd90b487 [formerly 2107976bd25c429521d4df7a92a3726a38806ba3]]]
Former-commit-id: d1cd90b487
Former-commit-id: 7d09253674 [formerly 64672eb478]
Former-commit-id: ea8ec5fbe7
2014-08-26 13:30:09 +00:00
Steve Harris
f4883fed1e Merge branch 'master_14.2.2' (14.2.2-29) into omaha_14.2.2
Former-commit-id: 8aadfe944a [formerly a03b5201cb] [formerly 8aadfe944a [formerly a03b5201cb] [formerly d850919303 [formerly 67c81cedb7321baad8dcf5fb4cea21ac152d2dcd]]]
Former-commit-id: d850919303
Former-commit-id: 28937f26bc [formerly 121a8ce866]
Former-commit-id: a45850d88e
2014-08-25 08:19:50 -05:00
Brian.Dyke
5b4d83e8a5 Merge branch 'omaha_14.2.2' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.2.2
Former-commit-id: f6748f1e28 [formerly 14d21b336d] [formerly f6748f1e28 [formerly 14d21b336d] [formerly aaabfa6cd0 [formerly 614b2bb59424f01d2608cd2db3a14dbcd77c90e6]]]
Former-commit-id: aaabfa6cd0
Former-commit-id: 5b188a713b [formerly d419fc59ff]
Former-commit-id: a29865b064
2014-08-21 12:07:16 -04:00
Qinglu.Lin
77e6647de8 ASM #15700 - Warngen issues an error and toggles off on Radar update
Change-Id: I51085cd1bb9c7286719f1bff4e04abe5a7a2363b

Former-commit-id: 3cc94603a2 [formerly fb92838427] [formerly 3cc94603a2 [formerly fb92838427] [formerly 2157a4aa3b [formerly b8a4741b2519e8c02a1b80ba8544be9b1c26d35c]]]
Former-commit-id: 2157a4aa3b
Former-commit-id: 787f157850 [formerly 3037a17366]
Former-commit-id: 040e1071b2
2014-08-21 10:43:22 -04:00
David Friedman
40c7d1971e ASM #16703 - Errors issuing Marine Products over areas under a Watch
Change-Id: Idd28b86771295c90cec3c9b3e7e2dfc96c84ff4f

Former-commit-id: b053e1e2ce [formerly 78ee5a56c5] [formerly b053e1e2ce [formerly 78ee5a56c5] [formerly 6a7638ddae [formerly 7027ff533991251f64f2e5a0deb31e2945cdde5f]]]
Former-commit-id: 6a7638ddae
Former-commit-id: 95fbbdf730 [formerly 76d78ff72e]
Former-commit-id: 2ce533f866
2014-08-20 14:13:32 +00:00
Steve Harris
634ccce5e4 Merge branch 'master_14.2.2' (14.2.2-27,28) into omaha_14.2.2
Former-commit-id: c998370edd [formerly 0d6d3bd7f5] [formerly c998370edd [formerly 0d6d3bd7f5] [formerly 5dd1435a5e [formerly 8f436bd859a52374fe5788102465a6a20355fda2]]]
Former-commit-id: 5dd1435a5e
Former-commit-id: e80723bcd4 [formerly c250de9a96]
Former-commit-id: 5a63c559b3
2014-08-19 12:38:53 -05:00
Brian.Dyke
fede3b4eb2 Merge branch 'master_14.2.2' into asm_14.2.2
Former-commit-id: 3bba82c371 [formerly ef9ddd0f98] [formerly 3bba82c371 [formerly ef9ddd0f98] [formerly ca564e58ea [formerly 3c1db35ef591bfe9c5124ad9c4c801d6acbdb8f8]]]
Former-commit-id: ca564e58ea
Former-commit-id: 41e9db65a4 [formerly 5676e51dc3]
Former-commit-id: 012ed15b36
2014-08-18 13:17:13 -04:00
Brian.Dyke
3e914c01fc Merge branch 'master_14.2.2' into asm_14.2.2
Former-commit-id: 2054d6f844 [formerly 9a212410b5] [formerly 2054d6f844 [formerly 9a212410b5] [formerly d82d58d38e [formerly 5c9880c3179bf376798bb5658aec3666bddd7d3e]]]
Former-commit-id: d82d58d38e
Former-commit-id: 1d297de174 [formerly 9b1b39f3be]
Former-commit-id: d96b05a86e
2014-08-18 11:47:38 -04:00
Brian.Dyke
5a7a28d562 Merge branch 'asm_14.2.2' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.2.2
Former-commit-id: f33e622e9d [formerly 0bdacc25f6] [formerly f33e622e9d [formerly 0bdacc25f6] [formerly 4d47e00887 [formerly 7a7e030bd70bb5bfee849750f1a8e1e4238ec0ee]]]
Former-commit-id: 4d47e00887
Former-commit-id: c6346336c0 [formerly 0e7c221bd7]
Former-commit-id: db0bc6ba12
2014-08-18 10:20:49 -04:00
Melissa Porricel
9404c0b585 ASM #15699 - Fix Grib decoder error
Change-Id: Ieabe763de544960f6e7bae0e2cf940eaa2493511

Former-commit-id: 9f20c63f97 [formerly 67e44f145a] [formerly 9f20c63f97 [formerly 67e44f145a] [formerly 7e78946ee0 [formerly e8c156d166cedc1553f9ffd8867633651443872d]]]
Former-commit-id: 7e78946ee0
Former-commit-id: 248205a78f [formerly 356d0e04f6]
Former-commit-id: e76123c79a
2014-08-15 13:41:53 -04:00
Brian.Dyke
fbaf15c8f8 Merge branch 'asm_14.2.2' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.2.2
Former-commit-id: a73c8d4cda [formerly 8b1b457310] [formerly a73c8d4cda [formerly 8b1b457310] [formerly d3888b16f3 [formerly bdfe1c263b8bcc0f6ebc8fd31c506e76271319ea]]]
Former-commit-id: d3888b16f3
Former-commit-id: d0985451d7 [formerly 89941d5ca9]
Former-commit-id: 627583a000
2014-08-15 11:52:35 -04:00
Michael Gamazaychikov
65daa0f117 ASM #15701 WarnGen displaying error for Watch Wording when switching from backup site to local site
Change-Id: I9ff834f0b3717d046f278b8a21ca955e5f5c4805

Former-commit-id: 2b450af136 [formerly 9897417235] [formerly 2b450af136 [formerly 9897417235] [formerly c14a5287ac [formerly 126ec43423a864df597bd6dd745671ee0bf4fbfb]]]
Former-commit-id: c14a5287ac
Former-commit-id: ab21a0f8e9 [formerly 4097a7ddd0]
Former-commit-id: 2115121def
2014-08-15 11:03:23 -04:00
Nate Jensen
346a3c5ed8 Issue #3524 ensure apache httpclient always sends credentials with https
requests

Change-Id: Ia3fef0d2236167c8b48c0107848f7e8a925acc1c

Former-commit-id: 6907c5a1cf [formerly 5bcddf1af1] [formerly 6907c5a1cf [formerly 5bcddf1af1] [formerly 9ddde59743 [formerly 843a3b51f2fd90275149d0d814f280ed64247a2c]]]
Former-commit-id: 9ddde59743
Former-commit-id: 4b114ba79b [formerly 97109d5864]
Former-commit-id: 00b327043c
2014-08-15 09:15:11 -05:00
Steve Harris
564c6e20ea Merge branch 'master_14.2.2' (14.2.2-26) into omaha_14.2.2
Former-commit-id: f23139ba39 [formerly 1839d53d2c] [formerly f23139ba39 [formerly 1839d53d2c] [formerly b4ac2e9c2c [formerly c5d804b092e56082337b80f717c6b2f3307fd9be]]]
Former-commit-id: b4ac2e9c2c
Former-commit-id: 75963915c4 [formerly b2e8abd924]
Former-commit-id: 68f238ea5b
2014-08-13 14:50:49 -05:00
Ron Anderson
c19231f91a Issue #3517 Improved iscMosaic memory utilization and error handling when unzipping input file.
Change-Id: Idcce2dd53e39a8b483c2d5e244d4ec27bce94489

Former-commit-id: d39b184eea [formerly 10a5053981] [formerly d39b184eea [formerly 10a5053981] [formerly e4d1cfe9e5 [formerly 36d33879425d32b4ff7de617d511d7a2c51b6a4e]]]
Former-commit-id: e4d1cfe9e5
Former-commit-id: 3ab0b660ac [formerly ad0d4d27e2]
Former-commit-id: b3752cd3b2
2014-08-13 09:03:48 -05:00
Brian.Dyke
10510022f3 Merge branch 'omaha_14.2.2' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.2.2
Former-commit-id: 63f000f11d [formerly 59183249ed] [formerly 63f000f11d [formerly 59183249ed] [formerly aefe154e51 [formerly 84fc55492f7eccf55d3bf8e7e3227c882286a8fb]]]
Former-commit-id: aefe154e51
Former-commit-id: ba4ddf9ceb [formerly 6043825b4c]
Former-commit-id: 7164c95a12
2014-08-12 13:24:35 -04:00
Richard Peter
e59ee6e8c4 Issue #3458 Update ldm-6.11.5 queue size
Change-Id: I6e434d31c9f39c896630b685ee9d86e81cc32afb

Former-commit-id: 635393cfb5 [formerly a9f8b72b6f] [formerly 635393cfb5 [formerly a9f8b72b6f] [formerly 7317d99519 [formerly c717d54c05cdae71b050eeee6afb06e6c71753a8]]]
Former-commit-id: 7317d99519
Former-commit-id: 17be38c6f8 [formerly 45b822c7cf]
Former-commit-id: f8cfa2ed28
2014-08-11 11:54:59 -05:00
Brian.Dyke
6aaec52bb2 Merge branch 'master_14.2.2' into asm_14.2.2
Former-commit-id: c532d924ee [formerly d5177787c6] [formerly c532d924ee [formerly d5177787c6] [formerly 54808cc027 [formerly 6c54705000e153a9c17465631149a26aaf5f8c67]]]
Former-commit-id: 54808cc027
Former-commit-id: b58885d191 [formerly 0cacdb9fc0]
Former-commit-id: d3cd0ca28a
2014-08-08 11:31:24 -04:00
Bryan Kowal
0a3fcc0c91 Issue #3470 - the wrapperCapture script is now packaged in the awips2-edex and awips2-qpid-java-broker rpms. additional
log4j jar is now included in the awips2-qpid-java-common rpm. Fixed AbstractScript import error.

Change-Id: I7acfdff45944b8d9dd2f75e85cca3cc6d54b1903

Former-commit-id: 09442217cd [formerly a9b4b4124a] [formerly 09442217cd [formerly a9b4b4124a] [formerly b568c25e10 [formerly d11649deb78aa356f27a22f33b38f7238513576c]]]
Former-commit-id: b568c25e10
Former-commit-id: b0c94a2d61 [formerly 1d6eb95f9f]
Former-commit-id: 25fd6f379f
2014-08-07 16:27:46 -05:00
Richard Peter
83c71feeff Issue #3470 Update wrapper to call wrapperCapture.sh on process restart
Former-commit-id: fc6aae3c3c [formerly 477119b739] [formerly fc6aae3c3c [formerly 477119b739] [formerly 96a1821753 [formerly e537db61848adeea0cef18e6a769597d746d6620]]]
Former-commit-id: 96a1821753
Former-commit-id: bc7d8bfe6d [formerly f7e0a6cf11]
Former-commit-id: fd18b7a134
2014-08-07 14:01:54 -05:00
Richard Peter
6ab1a7d511 Merge "Issue #3493 Grouped common VTECs together" into omaha_14.2.2
Former-commit-id: 83eae94f7b [formerly cefae5e9bd] [formerly 83eae94f7b [formerly cefae5e9bd] [formerly 76b2d682ab [formerly 90a8191245d599077ea7d42de2ee80f074a7397a]]]
Former-commit-id: 76b2d682ab
Former-commit-id: dea20dcc8a [formerly bb51150bc9]
Former-commit-id: f8b524dbaf
2014-08-07 09:21:55 -05:00
Jonathan Sanchez
1693c4cef5 Issue #3493 Grouped common VTECs together
Change-Id: Ia72150a4782e95ea075f42979c489f7ef5d69fb9

Former-commit-id: 46c3625f0c [formerly 0302efdc77] [formerly 46c3625f0c [formerly 0302efdc77] [formerly 31c3135496 [formerly 47de8da4cadd899ae9aa0ffe6c89a109491966bc]]]
Former-commit-id: 31c3135496
Former-commit-id: a2dce9ca73 [formerly f5abf465e2]
Former-commit-id: 88f1984064
2014-08-06 17:40:44 -05:00
Bryan Kowal
ab26a99200 Issue #3470 - finished TODO in yajsw ShellScript.java
Former-commit-id: dd7ae1f7d3 [formerly dd00d2fe38] [formerly dd7ae1f7d3 [formerly dd00d2fe38] [formerly 3b080e7c36 [formerly 3849f2d050a3e6f4d3c59c0f8bc2e021f3b59514]]]
Former-commit-id: 3b080e7c36
Former-commit-id: e1e6244b57 [formerly 8576c55443]
Former-commit-id: 12be1442f1
2014-08-06 16:34:35 -05:00
Ron Anderson
08296eaf7b Merge "Issue #3498 Provide upgrade scripts for Topo file name in D2D procedures and saved displays" into omaha_14.2.2
Former-commit-id: d38ab4f344 [formerly 6e25166972] [formerly d38ab4f344 [formerly 6e25166972] [formerly a1ea3eb3bc [formerly 1ed1ff3aabd3d3a4835591940fc70647147667f6]]]
Former-commit-id: a1ea3eb3bc
Former-commit-id: c403b06b55 [formerly 1d0b1e0aa2]
Former-commit-id: c750c5a37f
2014-08-06 16:14:00 -05:00
Ron Anderson
54ba19d631 Issue #3498 Provide upgrade scripts for Topo file name in D2D procedures and saved displays
Change-Id: I2b4577c972c884af08d59d7815017806928efa69

Former-commit-id: 0654b75fb2 [formerly cd72d75216] [formerly 0654b75fb2 [formerly cd72d75216] [formerly d3728fc462 [formerly bb204013345db535d7cf9ca103cb033cf2507def]]]
Former-commit-id: d3728fc462
Former-commit-id: 5f8529b844 [formerly 0fddd4e268]
Former-commit-id: ae4107adac
2014-08-06 14:00:47 -05:00
Ron Anderson
e75c785df6 Merge "Issue #3458 Increase ldm to edexBridge shared memory queue." into omaha_14.2.2
Former-commit-id: a93ba59bd1 [formerly 5aa1d7b692] [formerly a93ba59bd1 [formerly 5aa1d7b692] [formerly 214ec8cfa5 [formerly 1db29b26474545b85445ca4f0d5da75ff77f88c4]]]
Former-commit-id: 214ec8cfa5
Former-commit-id: 89aa442f9e [formerly 6cecfcd9dc]
Former-commit-id: 421a706c36
2014-08-06 12:06:32 -05:00
Richard Peter
24f06e6666 Issue #3458 Increase ldm to edexBridge shared memory queue.
Change-Id: I30f0db8b3802c13048587067fbf901c5a7903468

Former-commit-id: 01692edc6b [formerly bd2d97dc46] [formerly 01692edc6b [formerly bd2d97dc46] [formerly 8374869379 [formerly 21a63b7e1218efedab86d6034dd5b92810764cb9]]]
Former-commit-id: 8374869379
Former-commit-id: fbb7094b60 [formerly e155de7bbc]
Former-commit-id: 4e7687d442
2014-08-06 10:57:31 -05:00
Jonathan Sanchez
e6d9ff7359 Issue #3493 Allowed multiple watches to be displayed.
Change-Id: I8c69a07a5162868bc2a179960c7beb07d350cde9

Former-commit-id: a07674c864 [formerly 2946dc1904] [formerly a07674c864 [formerly 2946dc1904] [formerly 27d0e8eb52 [formerly e06ba2d33f9969ee3dc87491ac6bfa3e9ccb40b8]]]
Former-commit-id: 27d0e8eb52
Former-commit-id: bdd8f5682c [formerly 488b036a18]
Former-commit-id: 84a171eb7f
2014-08-05 12:23:16 -05:00
steve.naples
bbb977e8d5 ASM #15671 Fix PostShef to allow ingest with token set load_shef_ingest and ingestfilter not populated.
Change-Id: I55d8718f9bc50c9b0ce070e8a11cf09b3b4ff0fb

Former-commit-id: f5f348d681 [formerly 8185a7cd54] [formerly f5f348d681 [formerly 8185a7cd54] [formerly 0bb82e215e [formerly ed6769c047b8b21782da9a6040f2601465c150a2]]]
Former-commit-id: 0bb82e215e
Former-commit-id: 6563cdd3c1 [formerly 41e857da36]
Former-commit-id: d808a79ccf
2014-08-05 16:43:53 +00:00
Brian Clements
c78058dda1 Issue #3488 added bin range check to bin lightning decoder
Change-Id: Ib445da1a33c84283bc8dd46521b6f7c3381a51f9

Former-commit-id: ba934c5411 [formerly 8d928ab3a2] [formerly ba934c5411 [formerly 8d928ab3a2] [formerly 432f43b567 [formerly 53b274aab9952d372221c686d886ac12e8eb2e6a]]]
Former-commit-id: 432f43b567
Former-commit-id: 0455c90820 [formerly 61592f0e5a]
Former-commit-id: 19303c8b9f
2014-08-04 14:54:13 -05:00
Brian Clements
7f921c7c3d Issue #3488 added sanity check for bin range in lightning viz resource
Change-Id: I23ec1614821dcbc18c06f58e3ef00371988fc30a

Former-commit-id: dfc3545bf5 [formerly 7b312ab6a7] [formerly dfc3545bf5 [formerly 7b312ab6a7] [formerly 30ca12aae7 [formerly 701b56ec37053654e64cfd6ea831aad4ea7b9d8a]]]
Former-commit-id: 30ca12aae7
Former-commit-id: dd00eeb0ab [formerly 140bf429b9]
Former-commit-id: 6961892b9d
2014-08-04 11:22:12 -05:00
Juliya Dynina
d20ab7db34 Merge "ASM #15665 - Improve SatResource.java logging" into asm_14.2.2
Former-commit-id: 08c503140e [formerly 072104e2d7] [formerly 08c503140e [formerly 072104e2d7] [formerly 9e2124dd23 [formerly 98b85b738d099d8e2cc811aace8d6e6d913e45e9]]]
Former-commit-id: 9e2124dd23
Former-commit-id: 95ea71c3d8 [formerly 00cbc0892c]
Former-commit-id: d1c8c7cae2
2014-07-31 13:59:38 -05:00
Brian.Dyke
50b9351f33 Merge branch 'master_14.2.2' into asm_14.2.2
Former-commit-id: 5aa3d09885 [formerly 355a163270] [formerly 5aa3d09885 [formerly 355a163270] [formerly c3b7baf8a4 [formerly 2db7f14b353a5b23a38949a572d70bc12e5e5d0d]]]
Former-commit-id: c3b7baf8a4
Former-commit-id: aebcb01d90 [formerly 0d653cf04c]
Former-commit-id: 85bfcced95
2014-07-31 13:09:52 -04:00
Melissa Porricel
c3dabfacb0 ASM #15665 - Improve SatResource.java logging
Change-Id: Ibd0b246c36fe5547378a0a92793361ecc659cb1d

Former-commit-id: 8ac4827751 [formerly e31865ae4f] [formerly 8ac4827751 [formerly e31865ae4f] [formerly b59c3ee811 [formerly 5e369a7626987fbad409d25b7bcf3820c6268592]]]
Former-commit-id: b59c3ee811
Former-commit-id: 6fa5575f14 [formerly 7b4255bf2f]
Former-commit-id: faaf0c206c
2014-07-31 11:36:49 -04:00
Kiran.Shrestha
b13496cdbf ASM #97 - Freezing Level Height AGL for all models has units of dam instead of feet
Change-Id: Ia3d0709a6d3f8ea8d321218159faca7347df91fa

Former-commit-id: dd77c50f33 [formerly fbee424af7] [formerly dd77c50f33 [formerly fbee424af7] [formerly e650909e28 [formerly 24418dba4df50f5e46dd54302835e17db1576fe7]]]
Former-commit-id: e650909e28
Former-commit-id: bec9dcc014 [formerly 4a45669f4e]
Former-commit-id: b82ab79e86
2014-07-31 10:51:50 -04:00