Steve Harris
|
570b566638
|
Merge branch 'master_14.2.2' (14.2.2-31) into omaha_14.2.2
Former-commit-id: 06896c9032 [formerly db74ef9c6d ] [formerly 142f1bff66 ] [formerly 142f1bff66 [formerly db74dc031e ]] [formerly 06896c9032 [formerly db74ef9c6d ] [formerly 142f1bff66 ] [formerly 142f1bff66 [formerly db74dc031e ]] [formerly 425e8243f2 [formerly 142f1bff66 [formerly db74dc031e ] [formerly 425e8243f2 [formerly 80f0a6df2aeaffce0a58119ae4c3558c7fd08f21]]]]]
Former-commit-id: 425e8243f2
Former-commit-id: c1312a2e23 [formerly 527bb46f95 ] [formerly 5f0e7e3581 ] [formerly 7e79e730d36d4a4ed38a4b210e21602a7ddb5307 [formerly e4867f4026004901057b68452841e0b1dfb767d8] [formerly 5f0e7e3581 [formerly 6563187041 ]]]
Former-commit-id: aadd473b129155ba5604dac8f02313694fd27269 [formerly fbc4e34e259a9c29bb47e8d0de695403c93929f2] [formerly 3806bd14eb [formerly f72eb20900 ]]
Former-commit-id: 3806bd14eb
Former-commit-id: 248ece0f93
|
2014-09-02 08:09:48 -05:00 |
|
Daniel.Huffman
|
da92e559bf
|
ASM #16715 - Reverted and augmented Airports.xml and Fix.xml
Change-Id: Icd15e1947ec7d71b22d621b452d9e1c74767898e
Former-commit-id: 3c0c52255a [formerly 39f7795b7c ] [formerly c3731d5622 ] [formerly c3731d5622 [formerly c89a7169b0 ]] [formerly 3c0c52255a [formerly 39f7795b7c ] [formerly c3731d5622 ] [formerly c3731d5622 [formerly c89a7169b0 ]] [formerly ca2aa8811b [formerly c3731d5622 [formerly c89a7169b0 ] [formerly ca2aa8811b [formerly 09e0b79b25ec4f8854dde331469b0e7d6c4ffa1f]]]]]
Former-commit-id: ca2aa8811b
Former-commit-id: ff70deb291 [formerly eab387d780 ] [formerly eb9b743c46 ] [formerly 49e5aebb2ff7f604efc300cbf5344326fe52bbca [formerly 4e8f9df5152a35ae2d89acc7ab6ad942931f615c] [formerly eb9b743c46 [formerly dc2bc16bcc ]]]
Former-commit-id: d6031aa51356ee45418c43546ac05c7b1e3842d5 [formerly 228c90a329fdf4dbbc995cb3df98fa83f3fcfc66] [formerly ff850b4cf0 [formerly b97ea429c3 ]]
Former-commit-id: 62cd160299800fc29e94eabd520908267e4ff03c [formerly ff850b4cf0 ]
Former-commit-id: 6aa67f4588
|
2014-08-28 17:20:30 +00:00 |
|
Steve Harris
|
c480eaafa5
|
Merge branch 'master_14.2.2' (14.2.2-30) into omaha_14.2.2
Former-commit-id: 3046dbbd22 [formerly b551b21437 ] [formerly 080a50d28c ] [formerly 080a50d28c [formerly 891019aadd ]] [formerly 3046dbbd22 [formerly b551b21437 ] [formerly 080a50d28c ] [formerly 080a50d28c [formerly 891019aadd ]] [formerly d3b18900b3 [formerly 080a50d28c [formerly 891019aadd ] [formerly d3b18900b3 [formerly 579781387325a36e27135b8384b2a8b14cb38317]]]]]
Former-commit-id: d3b18900b3
Former-commit-id: a6296f4e53 [formerly 1508060d35 ] [formerly 60d5eec1b0 ] [formerly dc72feac40ad82bdf4b69c33e5afa67460d4d7e2 [formerly 21a5baadcdeaf201b5a2a14f4cba871239a0bec7] [formerly 60d5eec1b0 [formerly 683c32dc70 ]]]
Former-commit-id: 5de15545e92157551a4da516374ecb3e2b58ae3b [formerly d634eda640b378264ee1e0f86ec9817a64114239] [formerly 02c026ccce [formerly 3efff5ee42 ]]
Former-commit-id: 02c026ccce
Former-commit-id: 108d38a6e2
|
2014-08-27 11:34:06 -05:00 |
|
Daniel.Huffman
|
00057da8a8
|
ASM #16715 - Reverted and augmented Cities.xml
Change-Id: Ib83fab6854b68f11b72ef41104805b3f1431b8f0
Former-commit-id: c850d45689 [formerly d7c82cf4be ] [formerly e2e132e7a5 ] [formerly e2e132e7a5 [formerly 8962a069be ]] [formerly c850d45689 [formerly d7c82cf4be ] [formerly e2e132e7a5 ] [formerly e2e132e7a5 [formerly 8962a069be ]] [formerly d1cd90b487 [formerly e2e132e7a5 [formerly 8962a069be ] [formerly d1cd90b487 [formerly 2107976bd25c429521d4df7a92a3726a38806ba3]]]]]
Former-commit-id: d1cd90b487
Former-commit-id: 42dd55986f [formerly ebae452135 ] [formerly 7d09253674 ] [formerly bac93a60f10146e61adff4ed23de8283399ba11e [formerly 1d0b849f95b96d174f8fe7e2dac8ce729d2a1e58] [formerly 7d09253674 [formerly 64672eb478 ]]]
Former-commit-id: 9ca87da55399673b2da60658ab6faf67d4524f63 [formerly 9d4bcd480a7638756243875bdd8b10b8f6045689] [formerly 8c6fd18ece [formerly ea8ec5fbe7 ]]
Former-commit-id: 8c6fd18ece
Former-commit-id: 75cbc60355
|
2014-08-26 13:30:09 +00:00 |
|
Steve Harris
|
255192041c
|
Merge branch 'master_14.2.2' (14.2.2-29) into omaha_14.2.2
Former-commit-id: f9a912d3e5 [formerly 8a684bb351 ] [formerly 8aadfe944a ] [formerly 8aadfe944a [formerly a03b5201cb ]] [formerly f9a912d3e5 [formerly 8a684bb351 ] [formerly 8aadfe944a ] [formerly 8aadfe944a [formerly a03b5201cb ]] [formerly d850919303 [formerly 8aadfe944a [formerly a03b5201cb ] [formerly d850919303 [formerly 67c81cedb7321baad8dcf5fb4cea21ac152d2dcd]]]]]
Former-commit-id: d850919303
Former-commit-id: a60a46a7d9 [formerly 2560ce6724 ] [formerly 28937f26bc ] [formerly 5d7d4dd8324c592df9df0ced8ac8deb1bf0e2c60 [formerly 9438eed61e44da4ec8f772bce9429f8e45fdf8f7] [formerly 28937f26bc [formerly 121a8ce866 ]]]
Former-commit-id: 46772db67a267cf4047f910662e47a83775349b1 [formerly e99ab9da49ecb0f8b1ae915a0ce3a8e55cb043fb] [formerly f4883fed1e [formerly a45850d88e ]]
Former-commit-id: f4883fed1e
Former-commit-id: 325a595636
|
2014-08-25 08:19:50 -05:00 |
|
Brian.Dyke
|
44b2d7affc
|
Merge branch 'omaha_14.2.2' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.2.2
Former-commit-id: 850fee7d70 [formerly d4d26aaf75 ] [formerly f6748f1e28 ] [formerly f6748f1e28 [formerly 14d21b336d ]] [formerly 850fee7d70 [formerly d4d26aaf75 ] [formerly f6748f1e28 ] [formerly f6748f1e28 [formerly 14d21b336d ]] [formerly aaabfa6cd0 [formerly f6748f1e28 [formerly 14d21b336d ] [formerly aaabfa6cd0 [formerly 614b2bb59424f01d2608cd2db3a14dbcd77c90e6]]]]]
Former-commit-id: aaabfa6cd0
Former-commit-id: 930435a07d [formerly 41b4a9a504 ] [formerly 5b188a713b ] [formerly df92a7a7ad0677ae336434b8e403df4c1b65df68 [formerly 2bb78d3c5817cd77bb1da9ea0f462ed769072ce7] [formerly 5b188a713b [formerly d419fc59ff ]]]
Former-commit-id: 972809034bddfc9ecc26d07e2b5637ee8db5e77d [formerly 040f26f492eaea82f769d1ff4ae1fc168100f2f9] [formerly 5b4d83e8a5 [formerly a29865b064 ]]
Former-commit-id: 5b4d83e8a5
Former-commit-id: 1d5e5f779f
|
2014-08-21 12:07:16 -04:00 |
|
Qinglu.Lin
|
828c4a9e92
|
ASM #15700 - Warngen issues an error and toggles off on Radar update
Change-Id: I51085cd1bb9c7286719f1bff4e04abe5a7a2363b
Former-commit-id: 49d40dcaad [formerly bd03ec7a6f ] [formerly 3cc94603a2 ] [formerly 3cc94603a2 [formerly fb92838427 ]] [formerly 49d40dcaad [formerly bd03ec7a6f ] [formerly 3cc94603a2 ] [formerly 3cc94603a2 [formerly fb92838427 ]] [formerly 2157a4aa3b [formerly 3cc94603a2 [formerly fb92838427 ] [formerly 2157a4aa3b [formerly b8a4741b2519e8c02a1b80ba8544be9b1c26d35c]]]]]
Former-commit-id: 2157a4aa3b
Former-commit-id: 2c9cefb7cc [formerly 2cde7ae918 ] [formerly 787f157850 ] [formerly 5f5d6357d66ace0188b5112e5d26c63e0c2e9d4e [formerly 0f8e6a12a3a39382b7066fa24db8ef861b31c909] [formerly 787f157850 [formerly 3037a17366 ]]]
Former-commit-id: f13c8aadba268d1fb699654f07dafc55f2ba0b8e [formerly b6f56818727e927936380f47630dfcdd4372ea9f] [formerly 77e6647de8 [formerly 040e1071b2 ]]
Former-commit-id: 77e6647de8
Former-commit-id: 90cab42717
|
2014-08-21 10:43:22 -04:00 |
|
David Friedman
|
626bc17ad0
|
ASM #16703 - Errors issuing Marine Products over areas under a Watch
Change-Id: Idd28b86771295c90cec3c9b3e7e2dfc96c84ff4f
Former-commit-id: 737451a0cf [formerly 280f4a4b64 ] [formerly b053e1e2ce ] [formerly b053e1e2ce [formerly 78ee5a56c5 ]] [formerly 737451a0cf [formerly 280f4a4b64 ] [formerly b053e1e2ce ] [formerly b053e1e2ce [formerly 78ee5a56c5 ]] [formerly 6a7638ddae [formerly b053e1e2ce [formerly 78ee5a56c5 ] [formerly 6a7638ddae [formerly 7027ff533991251f64f2e5a0deb31e2945cdde5f]]]]]
Former-commit-id: 6a7638ddae
Former-commit-id: f75f6b4be6 [formerly 4f3458f5fb ] [formerly 95fbbdf730 ] [formerly a97a86c57b19848fb6b1ef6aca0ac16e5ace687d [formerly e0968bdffeb4e1072679ff80338a84d7bb82e1e9] [formerly 95fbbdf730 [formerly 76d78ff72e ]]]
Former-commit-id: fd9962dfe412b7f031d706160678f46a92bfe52b [formerly 2eb00233e833c805596310a628d40ea6515979a3] [formerly 40c7d1971e [formerly 2ce533f866 ]]
Former-commit-id: e55271e5d08793f99395b381ad0b5d1cf0cfaecd [formerly 40c7d1971e ]
Former-commit-id: b970f9769c
|
2014-08-20 14:13:32 +00:00 |
|
Steve Harris
|
ab9c7651d4
|
Merge branch 'master_14.2.2' (14.2.2-27,28) into omaha_14.2.2
Former-commit-id: 030528bb1a [formerly 7a8a23973c ] [formerly c998370edd ] [formerly c998370edd [formerly 0d6d3bd7f5 ]] [formerly 030528bb1a [formerly 7a8a23973c ] [formerly c998370edd ] [formerly c998370edd [formerly 0d6d3bd7f5 ]] [formerly 5dd1435a5e [formerly c998370edd [formerly 0d6d3bd7f5 ] [formerly 5dd1435a5e [formerly 8f436bd859a52374fe5788102465a6a20355fda2]]]]]
Former-commit-id: 5dd1435a5e
Former-commit-id: faeeaf37dc [formerly 4c936516b5 ] [formerly e80723bcd4 ] [formerly 358d7cd8916de98bbe6a5fa45c74bea574a16d33 [formerly 537a9bb20ea1af8517c474df68185ff974637d12] [formerly e80723bcd4 [formerly c250de9a96 ]]]
Former-commit-id: 0add94c0c7ff1e2827abfd4aed161b790a2fa485 [formerly 54d2adf44d177745c41b94a629f0351d7c6c5a1a] [formerly 634ccce5e4 [formerly 5a63c559b3 ]]
Former-commit-id: 634ccce5e4
Former-commit-id: 4e3ebca60f
|
2014-08-19 12:38:53 -05:00 |
|
Brian.Dyke
|
649827078b
|
Merge branch 'master_14.2.2' into asm_14.2.2
Former-commit-id: 0bea5c7396 [formerly a16d1d02b2 ] [formerly 3bba82c371 ] [formerly 3bba82c371 [formerly ef9ddd0f98 ]] [formerly 0bea5c7396 [formerly a16d1d02b2 ] [formerly 3bba82c371 ] [formerly 3bba82c371 [formerly ef9ddd0f98 ]] [formerly ca564e58ea [formerly 3bba82c371 [formerly ef9ddd0f98 ] [formerly ca564e58ea [formerly 3c1db35ef591bfe9c5124ad9c4c801d6acbdb8f8]]]]]
Former-commit-id: ca564e58ea
Former-commit-id: 2545a197d4 [formerly 80c87e2099 ] [formerly 41e9db65a4 ] [formerly a12806831825c7ba15ed03b37ac808ea6986f8e2 [formerly 5fdd8c6486b464aa09e1bf1061a42e0e2f3ef89d] [formerly 41e9db65a4 [formerly 5676e51dc3 ]]]
Former-commit-id: 3338fc41241803fe7429de1428ece62fc1337ec6 [formerly f674a739a1e297417ad2d7cac6479ae5d05be44e] [formerly fede3b4eb2 [formerly 012ed15b36 ]]
Former-commit-id: fede3b4eb2
Former-commit-id: 4149ddb527
|
2014-08-18 13:17:13 -04:00 |
|
Brian.Dyke
|
a158f2c1ba
|
Merge branch 'master_14.2.2' into asm_14.2.2
Former-commit-id: 7008a8e65b [formerly 867b82ca10 ] [formerly 2054d6f844 ] [formerly 2054d6f844 [formerly 9a212410b5 ]] [formerly 7008a8e65b [formerly 867b82ca10 ] [formerly 2054d6f844 ] [formerly 2054d6f844 [formerly 9a212410b5 ]] [formerly d82d58d38e [formerly 2054d6f844 [formerly 9a212410b5 ] [formerly d82d58d38e [formerly 5c9880c3179bf376798bb5658aec3666bddd7d3e]]]]]
Former-commit-id: d82d58d38e
Former-commit-id: 5ea1c8e527 [formerly 1d75000b56 ] [formerly 1d297de174 ] [formerly 82cb4fe006f37498758f9f6464f09861fab23aa6 [formerly a54b0882b92b48538ae981eea35265d473f09d9b] [formerly 1d297de174 [formerly 9b1b39f3be ]]]
Former-commit-id: da366ed1b19f9e24d035a4d9bb6077bd71c55e54 [formerly 417d137abb4a91e7c87dcbe3b13c48447942570e] [formerly 3e914c01fc [formerly d96b05a86e ]]
Former-commit-id: 3e914c01fc
Former-commit-id: 7788eed97a
|
2014-08-18 11:47:38 -04:00 |
|
Brian.Dyke
|
7b1411d4e1
|
Merge branch 'asm_14.2.2' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.2.2
Former-commit-id: f7f1bbb8e5 [formerly 367d7d8840 ] [formerly f33e622e9d ] [formerly f33e622e9d [formerly 0bdacc25f6 ]] [formerly f7f1bbb8e5 [formerly 367d7d8840 ] [formerly f33e622e9d ] [formerly f33e622e9d [formerly 0bdacc25f6 ]] [formerly 4d47e00887 [formerly f33e622e9d [formerly 0bdacc25f6 ] [formerly 4d47e00887 [formerly 7a7e030bd70bb5bfee849750f1a8e1e4238ec0ee]]]]]
Former-commit-id: 4d47e00887
Former-commit-id: 4ece715aca [formerly 47bc7e5ce6 ] [formerly c6346336c0 ] [formerly 49ac7b7537c98217ed925462d944103904f58300 [formerly 8e22f77ad55445d0bb785ef4977c37c2470e3b70] [formerly c6346336c0 [formerly 0e7c221bd7 ]]]
Former-commit-id: 72f4c3fde606e8c21da2bd5a1e40b324c556380e [formerly 5a997c3f6791e0d44cb26c7094da3e60e3b7a9ba] [formerly 5a7a28d562 [formerly db0bc6ba12 ]]
Former-commit-id: 5a7a28d562
Former-commit-id: fac7d16bdc
|
2014-08-18 10:20:49 -04:00 |
|
Melissa Porricel
|
cf2c219c5e
|
ASM #15699 - Fix Grib decoder error
Change-Id: Ieabe763de544960f6e7bae0e2cf940eaa2493511
Former-commit-id: ce6cd9c25b [formerly c05a460f4d ] [formerly 9f20c63f97 ] [formerly 9f20c63f97 [formerly 67e44f145a ]] [formerly ce6cd9c25b [formerly c05a460f4d ] [formerly 9f20c63f97 ] [formerly 9f20c63f97 [formerly 67e44f145a ]] [formerly 7e78946ee0 [formerly 9f20c63f97 [formerly 67e44f145a ] [formerly 7e78946ee0 [formerly e8c156d166cedc1553f9ffd8867633651443872d]]]]]
Former-commit-id: 7e78946ee0
Former-commit-id: 7a950c79d3 [formerly 3c6f76fb9c ] [formerly 248205a78f ] [formerly a9f764dd8598f3648785b89f3e868337e9520489 [formerly 1930a2fc1f1c8aafdfcb95816ecd28c123cb29d0] [formerly 248205a78f [formerly 356d0e04f6 ]]]
Former-commit-id: 834e958d31590b36d089fca8fc3ea3f44ebd30f5 [formerly a314482631a0d94beb986b6e22289cc4b34630f4] [formerly 9404c0b585 [formerly e76123c79a ]]
Former-commit-id: 9404c0b585
Former-commit-id: c0165fe2f3
|
2014-08-15 13:41:53 -04:00 |
|
Brian.Dyke
|
7e7a7638b4
|
Merge branch 'asm_14.2.2' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.2.2
Former-commit-id: 78e58406c1 [formerly a346d38358 ] [formerly a73c8d4cda ] [formerly a73c8d4cda [formerly 8b1b457310 ]] [formerly 78e58406c1 [formerly a346d38358 ] [formerly a73c8d4cda ] [formerly a73c8d4cda [formerly 8b1b457310 ]] [formerly d3888b16f3 [formerly a73c8d4cda [formerly 8b1b457310 ] [formerly d3888b16f3 [formerly bdfe1c263b8bcc0f6ebc8fd31c506e76271319ea]]]]]
Former-commit-id: d3888b16f3
Former-commit-id: c98cb9c5a6 [formerly eb41063d90 ] [formerly d0985451d7 ] [formerly bfd8d3e16e579d2b18bd40de43a581629b0dff2e [formerly fd68abe1b79e15942d5ec8b4ca3f245a8557b52f] [formerly d0985451d7 [formerly 89941d5ca9 ]]]
Former-commit-id: 0c0405b6c32bdd7abb82935336cce044421988d7 [formerly d8f41233bd6c920a624ad29b15b40ce0796a26c4] [formerly fbaf15c8f8 [formerly 627583a000 ]]
Former-commit-id: fbaf15c8f8
Former-commit-id: 3b65d74da7
|
2014-08-15 11:52:35 -04:00 |
|
Michael Gamazaychikov
|
241ff0cebb
|
ASM #15701 WarnGen displaying error for Watch Wording when switching from backup site to local site
Change-Id: I9ff834f0b3717d046f278b8a21ca955e5f5c4805
Former-commit-id: dede79833a [formerly d0c9d21538 ] [formerly 2b450af136 ] [formerly 2b450af136 [formerly 9897417235 ]] [formerly dede79833a [formerly d0c9d21538 ] [formerly 2b450af136 ] [formerly 2b450af136 [formerly 9897417235 ]] [formerly c14a5287ac [formerly 2b450af136 [formerly 9897417235 ] [formerly c14a5287ac [formerly 126ec43423a864df597bd6dd745671ee0bf4fbfb]]]]]
Former-commit-id: c14a5287ac
Former-commit-id: 639c91f083 [formerly 3050ad699d ] [formerly ab21a0f8e9 ] [formerly 92f83f35d03fcad61de8bd674c726ca37a8e7765 [formerly 2fcf1110fa9581e169e37c41d84f20cc066eb8b5] [formerly ab21a0f8e9 [formerly 4097a7ddd0 ]]]
Former-commit-id: 91a8a1da6f4d85af73bd999eca4853ac93c3d989 [formerly 158147e009c43f9b7c0c8b9b3edd0709f3289054] [formerly 65daa0f117 [formerly 2115121def ]]
Former-commit-id: 16fc11bce4006e95e6d2ad5347a79de7e47e362c [formerly 65daa0f117 ]
Former-commit-id: aa8278e995
|
2014-08-15 11:03:23 -04:00 |
|
Nate Jensen
|
57fa0c0490
|
Issue #3524 ensure apache httpclient always sends credentials with https
requests
Change-Id: Ia3fef0d2236167c8b48c0107848f7e8a925acc1c
Former-commit-id: c794dd6349 [formerly 4e99fa096a ] [formerly 6907c5a1cf ] [formerly 6907c5a1cf [formerly 5bcddf1af1 ]] [formerly c794dd6349 [formerly 4e99fa096a ] [formerly 6907c5a1cf ] [formerly 6907c5a1cf [formerly 5bcddf1af1 ]] [formerly 9ddde59743 [formerly 6907c5a1cf [formerly 5bcddf1af1 ] [formerly 9ddde59743 [formerly 843a3b51f2fd90275149d0d814f280ed64247a2c]]]]]
Former-commit-id: 9ddde59743
Former-commit-id: 3e41daa443 [formerly 74c550cb5b ] [formerly 4b114ba79b ] [formerly 9849b27aaa4dcd64b4958a23f576e04746f171ff [formerly 79c6b932ea0c1933106ec6ae9e32cdc0bc1d3cef] [formerly 4b114ba79b [formerly 97109d5864 ]]]
Former-commit-id: 05a3f7d1f70c886d64a0e796302c6264d6908c66 [formerly 5f8d7419269741a808cc8301aed4d148d69b3f38] [formerly 346a3c5ed8 [formerly 00b327043c ]]
Former-commit-id: 346a3c5ed8
Former-commit-id: 7bdfb0354f
|
2014-08-15 09:15:11 -05:00 |
|
Steve Harris
|
11ebf367a1
|
Merge branch 'master_14.2.2' (14.2.2-26) into omaha_14.2.2
Former-commit-id: 92654ef4a1 [formerly 5c3f6ea126 ] [formerly f23139ba39 ] [formerly f23139ba39 [formerly 1839d53d2c ]] [formerly 92654ef4a1 [formerly 5c3f6ea126 ] [formerly f23139ba39 ] [formerly f23139ba39 [formerly 1839d53d2c ]] [formerly b4ac2e9c2c [formerly f23139ba39 [formerly 1839d53d2c ] [formerly b4ac2e9c2c [formerly c5d804b092e56082337b80f717c6b2f3307fd9be]]]]]
Former-commit-id: b4ac2e9c2c
Former-commit-id: 866059d27e [formerly 8ab54a71ef ] [formerly 75963915c4 ] [formerly b0f94300a9f52b62f5972df64fe2d5dd92a4b508 [formerly fced3f02daea425f43df2e7bc4be39ba68485434] [formerly 75963915c4 [formerly b2e8abd924 ]]]
Former-commit-id: 4152be6505a1dbe615e2af1ced48c38187b6f669 [formerly dee2525bf0b65a766a6cca9676ec59686b1747c8] [formerly 564c6e20ea [formerly 68f238ea5b ]]
Former-commit-id: 564c6e20ea
Former-commit-id: 86b2bbc69c
|
2014-08-13 14:50:49 -05:00 |
|
Ron Anderson
|
4f8f339220
|
Issue #3517 Improved iscMosaic memory utilization and error handling when unzipping input file.
Change-Id: Idcce2dd53e39a8b483c2d5e244d4ec27bce94489
Former-commit-id: 2832de931d [formerly 76d75f775d ] [formerly d39b184eea ] [formerly d39b184eea [formerly 10a5053981 ]] [formerly 2832de931d [formerly 76d75f775d ] [formerly d39b184eea ] [formerly d39b184eea [formerly 10a5053981 ]] [formerly e4d1cfe9e5 [formerly d39b184eea [formerly 10a5053981 ] [formerly e4d1cfe9e5 [formerly 36d33879425d32b4ff7de617d511d7a2c51b6a4e]]]]]
Former-commit-id: e4d1cfe9e5
Former-commit-id: 0426d82b40 [formerly be9fd17cc4 ] [formerly 3ab0b660ac ] [formerly 842066bfdd5b35f0d21b873390801877e9ad0eec [formerly f7e37fab9ea557f2915f352a67326a0faeaa29df] [formerly 3ab0b660ac [formerly ad0d4d27e2 ]]]
Former-commit-id: a57643bea5bb61d39ac8392d6a0f064da74953ed [formerly bfe40e1ad259592380f545f260c4cda42d64aa9f] [formerly c19231f91a [formerly b3752cd3b2 ]]
Former-commit-id: c19231f91a
Former-commit-id: 2d92ad6bbf
|
2014-08-13 09:03:48 -05:00 |
|
Brian.Dyke
|
4f50ee732b
|
Merge branch 'omaha_14.2.2' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.2.2
Former-commit-id: 1cdca4b829 [formerly d023813321 ] [formerly 63f000f11d ] [formerly 63f000f11d [formerly 59183249ed ]] [formerly 1cdca4b829 [formerly d023813321 ] [formerly 63f000f11d ] [formerly 63f000f11d [formerly 59183249ed ]] [formerly aefe154e51 [formerly 63f000f11d [formerly 59183249ed ] [formerly aefe154e51 [formerly 84fc55492f7eccf55d3bf8e7e3227c882286a8fb]]]]]
Former-commit-id: aefe154e51
Former-commit-id: cb09b80b11 [formerly 607e1f0c74 ] [formerly ba4ddf9ceb ] [formerly 1c98459fae65a47d0340debb204c93cc01e71b2f [formerly 0894e361fba436b907c0d3bec483ef87116171dc] [formerly ba4ddf9ceb [formerly 6043825b4c ]]]
Former-commit-id: 44ff7cc08a6cde15df0c399f748001312a4536d4 [formerly acf0c24a4fd521cd951401f0ac971ae23801048f] [formerly 10510022f3 [formerly 7164c95a12 ]]
Former-commit-id: 10510022f3
Former-commit-id: a75337e3e2
|
2014-08-12 13:24:35 -04:00 |
|
Richard Peter
|
1ad324d7c1
|
Issue #3458 Update ldm-6.11.5 queue size
Change-Id: I6e434d31c9f39c896630b685ee9d86e81cc32afb
Former-commit-id: 658c9d88a2 [formerly d63eb7e878 ] [formerly 635393cfb5 ] [formerly 635393cfb5 [formerly a9f8b72b6f ]] [formerly 658c9d88a2 [formerly d63eb7e878 ] [formerly 635393cfb5 ] [formerly 635393cfb5 [formerly a9f8b72b6f ]] [formerly 7317d99519 [formerly 635393cfb5 [formerly a9f8b72b6f ] [formerly 7317d99519 [formerly c717d54c05cdae71b050eeee6afb06e6c71753a8]]]]]
Former-commit-id: 7317d99519
Former-commit-id: da67de45d8 [formerly e6d51c9740 ] [formerly 17be38c6f8 ] [formerly 0aff31cc4040dd309a80450166cbbdea76e3ac05 [formerly 66e0acf7f0af2dbdffc6fe5b38f0fc4ee6183eb6] [formerly 17be38c6f8 [formerly 45b822c7cf ]]]
Former-commit-id: 90d933cba2ba0e24e6707564fac703c08a961664 [formerly 822ea61d0178197ef1bd9380f947164d6f40ead4] [formerly e59ee6e8c4 [formerly f8cfa2ed28 ]]
Former-commit-id: e59ee6e8c4
Former-commit-id: f35fab3963
|
2014-08-11 11:54:59 -05:00 |
|
Brian.Dyke
|
5db172ffe5
|
Merge branch 'master_14.2.2' into asm_14.2.2
Former-commit-id: ffed7b3591 [formerly 19179c5e7b ] [formerly c532d924ee ] [formerly c532d924ee [formerly d5177787c6 ]] [formerly ffed7b3591 [formerly 19179c5e7b ] [formerly c532d924ee ] [formerly c532d924ee [formerly d5177787c6 ]] [formerly 54808cc027 [formerly c532d924ee [formerly d5177787c6 ] [formerly 54808cc027 [formerly 6c54705000e153a9c17465631149a26aaf5f8c67]]]]]
Former-commit-id: 54808cc027
Former-commit-id: 1c47911104 [formerly 62682392b3 ] [formerly b58885d191 ] [formerly 5d86fdf8352002480ae88d0d37f61e06d3366e05 [formerly c61d9091c6e0fadbcc52ed30b340b07d2cc2c037] [formerly b58885d191 [formerly 0cacdb9fc0 ]]]
Former-commit-id: 2e22089170eac7a5418d257699f9e5cfe11d1820 [formerly cc3f4a8cad9b4274d2c78f59b95a9ecdbef92a16] [formerly 6aaec52bb2 [formerly d3cd0ca28a ]]
Former-commit-id: 6aaec52bb2
Former-commit-id: 2e39eab6dd
|
2014-08-08 11:31:24 -04:00 |
|
Bryan Kowal
|
2e5a05e74b
|
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: 07563e7f91 [formerly 632e493332 ] [formerly 09442217cd ] [formerly 09442217cd [formerly a9b4b4124a ]] [formerly 07563e7f91 [formerly 632e493332 ] [formerly 09442217cd ] [formerly 09442217cd [formerly a9b4b4124a ]] [formerly b568c25e10 [formerly 09442217cd [formerly a9b4b4124a ] [formerly b568c25e10 [formerly d11649deb78aa356f27a22f33b38f7238513576c]]]]]
Former-commit-id: b568c25e10
Former-commit-id: ed8e35815b [formerly fbc1786ab1 ] [formerly b0c94a2d61 ] [formerly b16853fe31f52b312142a087ba8a1161db03e2c9 [formerly 74192b218460ef7622e9a89c78967d022d36f146] [formerly b0c94a2d61 [formerly 1d6eb95f9f ]]]
Former-commit-id: df69c9a1925207ea8b0825454c1b39bfc3ad11d1 [formerly 76739f9f732ad2b41a7cdf0ad838c5a360a6cc9b] [formerly 0a3fcc0c91 [formerly 25fd6f379f ]]
Former-commit-id: 0a3fcc0c91
Former-commit-id: 8ba34e138a
|
2014-08-07 16:27:46 -05:00 |
|
Richard Peter
|
e223c1f50d
|
Issue #3470 Update wrapper to call wrapperCapture.sh on process restart
Former-commit-id: ed8c442352 [formerly d3ba2f19bf ] [formerly fc6aae3c3c ] [formerly fc6aae3c3c [formerly 477119b739 ]] [formerly ed8c442352 [formerly d3ba2f19bf ] [formerly fc6aae3c3c ] [formerly fc6aae3c3c [formerly 477119b739 ]] [formerly 96a1821753 [formerly fc6aae3c3c [formerly 477119b739 ] [formerly 96a1821753 [formerly e537db61848adeea0cef18e6a769597d746d6620]]]]]
Former-commit-id: 96a1821753
Former-commit-id: bb4008cee3 [formerly 6bb571bc37 ] [formerly bc7d8bfe6d ] [formerly 5a27e66a244460faec856b4274c52f7c2ef30ac6 [formerly 98331407f735241458d85aae0c3f5b6e298efa12] [formerly bc7d8bfe6d [formerly f7e0a6cf11 ]]]
Former-commit-id: e8709dcd40f81dda9f07dc5c29890dd54e8b2ab9 [formerly 04049b9d4b9e515e807702c87328284991445618] [formerly 83c71feeff [formerly fd18b7a134 ]]
Former-commit-id: f822f8cf294d2a0dbcc428f5238dfc5c128a4688 [formerly 83c71feeff ]
Former-commit-id: 9f90398239
|
2014-08-07 14:01:54 -05:00 |
|
Richard Peter
|
0a107ceae4
|
Merge "Issue #3493 Grouped common VTECs together" into omaha_14.2.2
Former-commit-id: 17810d0c9f [formerly 56bf2c9b35 ] [formerly 83eae94f7b ] [formerly 83eae94f7b [formerly cefae5e9bd ]] [formerly 17810d0c9f [formerly 56bf2c9b35 ] [formerly 83eae94f7b ] [formerly 83eae94f7b [formerly cefae5e9bd ]] [formerly 76b2d682ab [formerly 83eae94f7b [formerly cefae5e9bd ] [formerly 76b2d682ab [formerly 90a8191245d599077ea7d42de2ee80f074a7397a]]]]]
Former-commit-id: 76b2d682ab
Former-commit-id: 72f1085da3 [formerly 7120f73114 ] [formerly dea20dcc8a ] [formerly 466598eabc54c33d09a94ebe688ba184da57e4a9 [formerly 704ef84923faf786e9daeba012467caa6483e73c] [formerly dea20dcc8a [formerly bb51150bc9 ]]]
Former-commit-id: d35c15d32e6112695a413a4cbdec343ce2e4a21d [formerly f9979f62f88b66ec855779f54b4a1c19e5725e9e] [formerly 6ab1a7d511 [formerly f8b524dbaf ]]
Former-commit-id: 6ab1a7d511
Former-commit-id: 286c913470
|
2014-08-07 09:21:55 -05:00 |
|
Jonathan Sanchez
|
4a6b2d30a5
|
Issue #3493 Grouped common VTECs together
Change-Id: Ia72150a4782e95ea075f42979c489f7ef5d69fb9
Former-commit-id: a2ce9254c5 [formerly e9b5d0afe0 ] [formerly 46c3625f0c ] [formerly 46c3625f0c [formerly 0302efdc77 ]] [formerly a2ce9254c5 [formerly e9b5d0afe0 ] [formerly 46c3625f0c ] [formerly 46c3625f0c [formerly 0302efdc77 ]] [formerly 31c3135496 [formerly 46c3625f0c [formerly 0302efdc77 ] [formerly 31c3135496 [formerly 47de8da4cadd899ae9aa0ffe6c89a109491966bc]]]]]
Former-commit-id: 31c3135496
Former-commit-id: 7f13ea6dea [formerly 2dff112b62 ] [formerly a2dce9ca73 ] [formerly 6899717b6b17ac1290d250f9c934a2386f8a7022 [formerly 38fe40e483379640f40fd247edf0ae3bd23e3aee] [formerly a2dce9ca73 [formerly f5abf465e2 ]]]
Former-commit-id: d4bc052201e2efc21ee0f0890ba67e473f5bee7e [formerly 7cd0d66ca2db47ccffa8c0aa34f9ec4390ca53ae] [formerly 1693c4cef5 [formerly 88f1984064 ]]
Former-commit-id: 1693c4cef5
Former-commit-id: 80d7f18e57
|
2014-08-06 17:40:44 -05:00 |
|
Bryan Kowal
|
d72b7b8cf4
|
Issue #3470 - finished TODO in yajsw ShellScript.java
Former-commit-id: 67e65b45c1 [formerly 51cf294761 ] [formerly dd7ae1f7d3 ] [formerly dd7ae1f7d3 [formerly dd00d2fe38 ]] [formerly 67e65b45c1 [formerly 51cf294761 ] [formerly dd7ae1f7d3 ] [formerly dd7ae1f7d3 [formerly dd00d2fe38 ]] [formerly 3b080e7c36 [formerly dd7ae1f7d3 [formerly dd00d2fe38 ] [formerly 3b080e7c36 [formerly 3849f2d050a3e6f4d3c59c0f8bc2e021f3b59514]]]]]
Former-commit-id: 3b080e7c36
Former-commit-id: 0d615a05df [formerly 6a9bfbd79b ] [formerly e1e6244b57 ] [formerly 8130a9d79e056e1068a024567dee26eb7ff23bb1 [formerly 6ec8397ba5668e78293c9747af09f6ddbe896496] [formerly e1e6244b57 [formerly 8576c55443 ]]]
Former-commit-id: e6624f1440a24014e93bf3109c92cd857a492967 [formerly 1418e0fe6ccbbc6cfa6a472d836d6367b444f12c] [formerly ab26a99200 [formerly 12be1442f1 ]]
Former-commit-id: ab26a99200
Former-commit-id: 5e18599cf4
|
2014-08-06 16:34:35 -05:00 |
|
Ron Anderson
|
3a68e95190
|
Merge "Issue #3498 Provide upgrade scripts for Topo file name in D2D procedures and saved displays" into omaha_14.2.2
Former-commit-id: 50bf589712 [formerly 94cf72add5 ] [formerly d38ab4f344 ] [formerly d38ab4f344 [formerly 6e25166972 ]] [formerly 50bf589712 [formerly 94cf72add5 ] [formerly d38ab4f344 ] [formerly d38ab4f344 [formerly 6e25166972 ]] [formerly a1ea3eb3bc [formerly d38ab4f344 [formerly 6e25166972 ] [formerly a1ea3eb3bc [formerly 1ed1ff3aabd3d3a4835591940fc70647147667f6]]]]]
Former-commit-id: a1ea3eb3bc
Former-commit-id: 2888a1c7ae [formerly 0908fac42e ] [formerly c403b06b55 ] [formerly 797242c0d681323f6a2fce86b2fa5accf9e87ff7 [formerly 3b913d7338221f3061b65b1f75efa1d17a133af3] [formerly c403b06b55 [formerly 1d0b1e0aa2 ]]]
Former-commit-id: d98ccfa0b314ce9ecc1821d9170b96004bef21b0 [formerly 30060cd3076803a34a876b513aca4f6da61de0c4] [formerly 08296eaf7b [formerly c750c5a37f ]]
Former-commit-id: 08296eaf7b
Former-commit-id: 5472c4792a
|
2014-08-06 16:14:00 -05:00 |
|
Ron Anderson
|
1a785497de
|
Issue #3498 Provide upgrade scripts for Topo file name in D2D procedures and saved displays
Change-Id: I2b4577c972c884af08d59d7815017806928efa69
Former-commit-id: e786e49767 [formerly b15013e959 ] [formerly 0654b75fb2 ] [formerly 0654b75fb2 [formerly cd72d75216 ]] [formerly e786e49767 [formerly b15013e959 ] [formerly 0654b75fb2 ] [formerly 0654b75fb2 [formerly cd72d75216 ]] [formerly d3728fc462 [formerly 0654b75fb2 [formerly cd72d75216 ] [formerly d3728fc462 [formerly bb204013345db535d7cf9ca103cb033cf2507def]]]]]
Former-commit-id: d3728fc462
Former-commit-id: 02e34e5620 [formerly 1ab4a42d95 ] [formerly 5f8529b844 ] [formerly b70380f50240858fc28a3862ce5a0cc797cd9f31 [formerly b22462ab20225076b497bb464786b9627fdef214] [formerly 5f8529b844 [formerly 0fddd4e268 ]]]
Former-commit-id: d0cd61621b22ca8ffe3297630f578c9d8f3b3dc4 [formerly bec327cf37c15f28952054acf0a9d8601701518e] [formerly 54ba19d631 [formerly ae4107adac ]]
Former-commit-id: 54ba19d631
Former-commit-id: 63c454484c
|
2014-08-06 14:00:47 -05:00 |
|
Ron Anderson
|
7b3cec6f40
|
Merge "Issue #3458 Increase ldm to edexBridge shared memory queue." into omaha_14.2.2
Former-commit-id: e184a7cfe7 [formerly 40e93f4626 ] [formerly a93ba59bd1 ] [formerly a93ba59bd1 [formerly 5aa1d7b692 ]] [formerly e184a7cfe7 [formerly 40e93f4626 ] [formerly a93ba59bd1 ] [formerly a93ba59bd1 [formerly 5aa1d7b692 ]] [formerly 214ec8cfa5 [formerly a93ba59bd1 [formerly 5aa1d7b692 ] [formerly 214ec8cfa5 [formerly 1db29b26474545b85445ca4f0d5da75ff77f88c4]]]]]
Former-commit-id: 214ec8cfa5
Former-commit-id: 93adc087ef [formerly 2c772fb4ca ] [formerly 89aa442f9e ] [formerly ec06b2bc9f761a724558e8a9586ee7ef7fec1231 [formerly 13f88c9db5706f4f719040e0290d5621013bf4e1] [formerly 89aa442f9e [formerly 6cecfcd9dc ]]]
Former-commit-id: a34c4262a3ff533f1a8214e45cbf14f0e3f4c654 [formerly 1147989380e9f463914acb6993f647d6c175bc75] [formerly e75c785df6 [formerly 421a706c36 ]]
Former-commit-id: e75c785df6
Former-commit-id: f49967733f
|
2014-08-06 12:06:32 -05:00 |
|
Richard Peter
|
329b8139b9
|
Issue #3458 Increase ldm to edexBridge shared memory queue.
Change-Id: I30f0db8b3802c13048587067fbf901c5a7903468
Former-commit-id: 4bf6607508 [formerly 1e6502af95 ] [formerly 01692edc6b ] [formerly 01692edc6b [formerly bd2d97dc46 ]] [formerly 4bf6607508 [formerly 1e6502af95 ] [formerly 01692edc6b ] [formerly 01692edc6b [formerly bd2d97dc46 ]] [formerly 8374869379 [formerly 01692edc6b [formerly bd2d97dc46 ] [formerly 8374869379 [formerly 21a63b7e1218efedab86d6034dd5b92810764cb9]]]]]
Former-commit-id: 8374869379
Former-commit-id: d4fd67e102 [formerly eb60541db3 ] [formerly fbb7094b60 ] [formerly 06867ab4c1525fed608f72fe46a076a288e435af [formerly 9a73fc5f58eae211e98112c3ab36c3b2a06bb1de] [formerly fbb7094b60 [formerly e155de7bbc ]]]
Former-commit-id: 3d778163b99087072d3f58a17dcca880d3c9d76f [formerly e05c7dad4a8b16c419ffc3befd4bc04d56250181] [formerly 24f06e6666 [formerly 4e7687d442 ]]
Former-commit-id: 24f06e6666
Former-commit-id: edd8eab06d
|
2014-08-06 10:57:31 -05:00 |
|
Jonathan Sanchez
|
7e9de246a5
|
Issue #3493 Allowed multiple watches to be displayed.
Change-Id: I8c69a07a5162868bc2a179960c7beb07d350cde9
Former-commit-id: 642cfc1712 [formerly 290cd3eb49 ] [formerly a07674c864 ] [formerly a07674c864 [formerly 2946dc1904 ]] [formerly 642cfc1712 [formerly 290cd3eb49 ] [formerly a07674c864 ] [formerly a07674c864 [formerly 2946dc1904 ]] [formerly 27d0e8eb52 [formerly a07674c864 [formerly 2946dc1904 ] [formerly 27d0e8eb52 [formerly e06ba2d33f9969ee3dc87491ac6bfa3e9ccb40b8]]]]]
Former-commit-id: 27d0e8eb52
Former-commit-id: 7c3ee37ca9 [formerly c4f3384eb9 ] [formerly bdd8f5682c ] [formerly 7b1501243c0267ad11fc3fbecb10987dda30e67e [formerly b53233b50cc4f4a165ab3733286e939f79418e32] [formerly bdd8f5682c [formerly 488b036a18 ]]]
Former-commit-id: c521c2532b9ab2fc8f81ebb1b5f1d7bc0fba2ae3 [formerly ba214ac18c1a8d8a908750529c32d104330073b7] [formerly e6d9ff7359 [formerly 84a171eb7f ]]
Former-commit-id: e6d9ff7359
Former-commit-id: 943d5908d6
|
2014-08-05 12:23:16 -05:00 |
|
steve.naples
|
e3a2af1090
|
ASM #15671 Fix PostShef to allow ingest with token set load_shef_ingest and ingestfilter not populated.
Change-Id: I55d8718f9bc50c9b0ce070e8a11cf09b3b4ff0fb
Former-commit-id: d6fe77cad4 [formerly c8725135dd ] [formerly f5f348d681 ] [formerly f5f348d681 [formerly 8185a7cd54 ]] [formerly d6fe77cad4 [formerly c8725135dd ] [formerly f5f348d681 ] [formerly f5f348d681 [formerly 8185a7cd54 ]] [formerly 0bb82e215e [formerly f5f348d681 [formerly 8185a7cd54 ] [formerly 0bb82e215e [formerly ed6769c047b8b21782da9a6040f2601465c150a2]]]]]
Former-commit-id: 0bb82e215e
Former-commit-id: 822d001a34 [formerly c013906796 ] [formerly 6563cdd3c1 ] [formerly 565b7ab1c248362f37f4cd0634894575c4c1d1dc [formerly 74747d6bd9ebeb1e178a4de5ebba2cad833c65c6] [formerly 6563cdd3c1 [formerly 41e857da36 ]]]
Former-commit-id: 6441e8f2ed05b28171c6fc434359c891229f4f08 [formerly f4fffbcc7c9d8e7240d89b086a25cd05c0c90780] [formerly bbb977e8d5 [formerly d808a79ccf ]]
Former-commit-id: bbb977e8d5
Former-commit-id: 1021ac8f1a
|
2014-08-05 16:43:53 +00:00 |
|
Brian Clements
|
da7718ac41
|
Issue #3488 added bin range check to bin lightning decoder
Change-Id: Ib445da1a33c84283bc8dd46521b6f7c3381a51f9
Former-commit-id: 4433cecc2d [formerly 5a11e28b11 ] [formerly ba934c5411 ] [formerly ba934c5411 [formerly 8d928ab3a2 ]] [formerly 4433cecc2d [formerly 5a11e28b11 ] [formerly ba934c5411 ] [formerly ba934c5411 [formerly 8d928ab3a2 ]] [formerly 432f43b567 [formerly ba934c5411 [formerly 8d928ab3a2 ] [formerly 432f43b567 [formerly 53b274aab9952d372221c686d886ac12e8eb2e6a]]]]]
Former-commit-id: 432f43b567
Former-commit-id: ec1e69ffe5 [formerly 17f5a8b3ba ] [formerly 0455c90820 ] [formerly 0d77c0fcb49f9c68639ae1689c770c5ea40d0143 [formerly 855189eef7bc4af2533a751f5d0dfc5daf3f4230] [formerly 0455c90820 [formerly 61592f0e5a ]]]
Former-commit-id: 00a3ec8982019bb836804c9b5a7acb91890cfe25 [formerly 189c3134bd8a1ee4ecf8cf3e012e4f7cb159012c] [formerly c78058dda1 [formerly 19303c8b9f ]]
Former-commit-id: c78058dda1
Former-commit-id: ceca67bccf
|
2014-08-04 14:54:13 -05:00 |
|
Brian Clements
|
1e33505eb3
|
Issue #3488 added sanity check for bin range in lightning viz resource
Change-Id: I23ec1614821dcbc18c06f58e3ef00371988fc30a
Former-commit-id: ed33d78a01 [formerly 8b10703f28 ] [formerly dfc3545bf5 ] [formerly dfc3545bf5 [formerly 7b312ab6a7 ]] [formerly ed33d78a01 [formerly 8b10703f28 ] [formerly dfc3545bf5 ] [formerly dfc3545bf5 [formerly 7b312ab6a7 ]] [formerly 30ca12aae7 [formerly dfc3545bf5 [formerly 7b312ab6a7 ] [formerly 30ca12aae7 [formerly 701b56ec37053654e64cfd6ea831aad4ea7b9d8a]]]]]
Former-commit-id: 30ca12aae7
Former-commit-id: 84a52a396f [formerly 147cbdab96 ] [formerly dd00eeb0ab ] [formerly 0bdf5ea8afa838958eb39a38dbd867274f5fe13d [formerly 71167eccca446d527adb49a80b8bcdc21646399c] [formerly dd00eeb0ab [formerly 140bf429b9 ]]]
Former-commit-id: 2901ece0157ecf5a87292ac3a5af3acfb80a7266 [formerly d6c9611e05c32ef39b4ceba2d3995eaff57f2da8] [formerly 7f921c7c3d [formerly 6961892b9d ]]
Former-commit-id: 7f921c7c3d
Former-commit-id: 0db7a9faf6
|
2014-08-04 11:22:12 -05:00 |
|
Juliya Dynina
|
11497e77c6
|
Merge "ASM #15665 - Improve SatResource.java logging" into asm_14.2.2
Former-commit-id: 20a9f0e95c [formerly 33f17b1c7b ] [formerly 08c503140e ] [formerly 08c503140e [formerly 072104e2d7 ]] [formerly 20a9f0e95c [formerly 33f17b1c7b ] [formerly 08c503140e ] [formerly 08c503140e [formerly 072104e2d7 ]] [formerly 9e2124dd23 [formerly 08c503140e [formerly 072104e2d7 ] [formerly 9e2124dd23 [formerly 98b85b738d099d8e2cc811aace8d6e6d913e45e9]]]]]
Former-commit-id: 9e2124dd23
Former-commit-id: 6189332d94 [formerly caf0934ed1 ] [formerly 95ea71c3d8 ] [formerly e792c39b89fb0ad2fab62393dbfa2cfbd45346e8 [formerly 12d4995fba56c2a7e4dd4e045704442dab8e3bb5] [formerly 95ea71c3d8 [formerly 00cbc0892c ]]]
Former-commit-id: 740c239f31298c02997ebfc90f3d65458916fbe9 [formerly 12f8452491f563b0ad6a58b694f00813bcdbbd6f] [formerly d20ab7db34 [formerly d1c8c7cae2 ]]
Former-commit-id: d20ab7db34
Former-commit-id: e695c1a8e7
|
2014-07-31 13:59:38 -05:00 |
|
Brian.Dyke
|
ce0d32b5da
|
Merge branch 'master_14.2.2' into asm_14.2.2
Former-commit-id: 3e6616d243 [formerly 1141ed475d ] [formerly 5aa3d09885 ] [formerly 5aa3d09885 [formerly 355a163270 ]] [formerly 3e6616d243 [formerly 1141ed475d ] [formerly 5aa3d09885 ] [formerly 5aa3d09885 [formerly 355a163270 ]] [formerly c3b7baf8a4 [formerly 5aa3d09885 [formerly 355a163270 ] [formerly c3b7baf8a4 [formerly 2db7f14b353a5b23a38949a572d70bc12e5e5d0d]]]]]
Former-commit-id: c3b7baf8a4
Former-commit-id: 6d5699eba7 [formerly f63243a858 ] [formerly aebcb01d90 ] [formerly 648b17a5da4a10026a5a0a4ef5746530c083f411 [formerly d5a0bf0e7bd4a628a460a27b34484d77418c60ac] [formerly aebcb01d90 [formerly 0d653cf04c ]]]
Former-commit-id: 53867f6fe979009a510a53abeb1925ae528f87fb [formerly f6686b15e6da0b3d60850eee7bc62ba875b78106] [formerly 50b9351f33 [formerly 85bfcced95 ]]
Former-commit-id: 50b9351f33
Former-commit-id: 680a9e7709
|
2014-07-31 13:09:52 -04:00 |
|
Melissa Porricel
|
41618b51e0
|
ASM #15665 - Improve SatResource.java logging
Change-Id: Ibd0b246c36fe5547378a0a92793361ecc659cb1d
Former-commit-id: 58f9ad0851 [formerly 5c34651f81 ] [formerly 8ac4827751 ] [formerly 8ac4827751 [formerly e31865ae4f ]] [formerly 58f9ad0851 [formerly 5c34651f81 ] [formerly 8ac4827751 ] [formerly 8ac4827751 [formerly e31865ae4f ]] [formerly b59c3ee811 [formerly 8ac4827751 [formerly e31865ae4f ] [formerly b59c3ee811 [formerly 5e369a7626987fbad409d25b7bcf3820c6268592]]]]]
Former-commit-id: b59c3ee811
Former-commit-id: 6b53a9a8c9 [formerly 0f2260605f ] [formerly 6fa5575f14 ] [formerly 12f0d8b687c104bb185d414711f3e4cb5434cb2f [formerly a5a4e144ec1fa2c24505ca6a3f4a7b45a578b3c6] [formerly 6fa5575f14 [formerly 7b4255bf2f ]]]
Former-commit-id: 41ad989fdd75f888114a347f140cea340e9ff8a4 [formerly 480b25a0b11d374cf63c18268b8f3f58a20a9467] [formerly c3dabfacb0 [formerly faaf0c206c ]]
Former-commit-id: c3dabfacb0
Former-commit-id: 8514654c37
|
2014-07-31 11:36:49 -04:00 |
|
Kiran.Shrestha
|
f6a5072385
|
ASM #97 - Freezing Level Height AGL for all models has units of dam instead of feet
Change-Id: Ia3d0709a6d3f8ea8d321218159faca7347df91fa
Former-commit-id: d09388402b [formerly 4d2475cfed ] [formerly dd77c50f33 ] [formerly dd77c50f33 [formerly fbee424af7 ]] [formerly d09388402b [formerly 4d2475cfed ] [formerly dd77c50f33 ] [formerly dd77c50f33 [formerly fbee424af7 ]] [formerly e650909e28 [formerly dd77c50f33 [formerly fbee424af7 ] [formerly e650909e28 [formerly 24418dba4df50f5e46dd54302835e17db1576fe7]]]]]
Former-commit-id: e650909e28
Former-commit-id: 28ecde8f28 [formerly 264719d1c7 ] [formerly bec9dcc014 ] [formerly c1d8ceac4568e0d96c0259db58d97240c842eca3 [formerly ebf45c9fd382c38f8b041a79e7bfe115efd5b875] [formerly bec9dcc014 [formerly 4a45669f4e ]]]
Former-commit-id: dee56d13b3ab17ebe64d695234be93d7e08edfe3 [formerly 6e2905c1d8fee28e5c6f1fefd258ebfc68609aca] [formerly b13496cdbf [formerly b82ab79e86 ]]
Former-commit-id: b13496cdbf
Former-commit-id: bca8f1a0f8
|
2014-07-31 10:51:50 -04:00 |
|
Brian.Dyke
|
6a615f9dcb
|
Merge branch 'asm_14.2.2' into master_14.2.2
Former-commit-id: 748434a991 [formerly a9cf7e9951 ] [formerly eeca2f2ec8 ] [formerly eeca2f2ec8 [formerly 3598f7b549 ]] [formerly 748434a991 [formerly a9cf7e9951 ] [formerly eeca2f2ec8 ] [formerly eeca2f2ec8 [formerly 3598f7b549 ]] [formerly 905728d2fb [formerly eeca2f2ec8 [formerly 3598f7b549 ] [formerly 905728d2fb [formerly 96ff2234e0d8893695b33a79d24a026a1a409073]]]]]
Former-commit-id: 905728d2fb
Former-commit-id: 0e2c728cf1 [formerly d40310d407 ] [formerly 370b180653 ] [formerly 3eddb538d07d54bfe444953b2ffab08872133c8e [formerly cb0d54b6f5c9c825dfeb23dea6bf566569b45e86] [formerly 370b180653 [formerly e3745633a3 ]]]
Former-commit-id: f08a902c12b35fecf0e68462db28919c978211e1 [formerly 5fff891aca335077a8aa0592db78791cd85164e7] [formerly 29bc56c37f [formerly f5030dfeb5 ]]
Former-commit-id: 29bc56c37f
Former-commit-id: a395bc2a5a
|
2014-07-31 09:56:21 -04:00 |
|
Shawn.Hooper
|
1fffcaa946
|
ASM #15627 Revert "ASM #15627 - WarnGen leaving out reference to State that is under SVR or TOR Watch in SPS text products."
This reverts commit 9732ea69398c323fee2b61570bfc18ab595da709 [formerly 8cffe955a9 ] [formerly c599b2cb12 [formerly c71189dd92 ] [formerly e24dd6958e ] [formerly e24dd6958e [formerly ba4c386f30 ]] [formerly c599b2cb12 [formerly c71189dd92 ] [formerly e24dd6958e ] [formerly e24dd6958e [formerly ba4c386f30 ]] [formerly 8cffe955a9 [formerly e24dd6958e [formerly ba4c386f30 ] [formerly 8cffe955a9 [formerly 00ec5e2d47809d084b3e24e1f1503af96d129fed]]]]]].
Change-Id: Ie01ca9463a4db371ffce0b6e38d5c43e1f9addf2
Former-commit-id: ea58b64cad [formerly adcd4dfa64 ] [formerly 27f50397aa ] [formerly 27f50397aa [formerly 976c7b2d4a ]] [formerly ea58b64cad [formerly adcd4dfa64 ] [formerly 27f50397aa ] [formerly 27f50397aa [formerly 976c7b2d4a ]] [formerly 4e322737ce [formerly 27f50397aa [formerly 976c7b2d4a ] [formerly 4e322737ce [formerly d272d426f8bd218954a75a7b2e19d21b30f975cb]]]]]
Former-commit-id: 4e322737ce
Former-commit-id: bee208650a [formerly 6388744d4f ] [formerly af19d9f9c4 ] [formerly 2e7a04b8a66b981e7e05a4f63f03429b758a63a1 [formerly 04fd2b332f2591e977341aaaa648d03eb4ecc9c3] [formerly af19d9f9c4 [formerly fe0fffe51b ]]]
Former-commit-id: 0d7758fc7ff8ab05b7ecd310c5d822ef2ca66265 [formerly 0693c97544c8dd01a9ad695768ee8e2df2354373] [formerly 53daf4e3bc [formerly 17ac974932 ]]
Former-commit-id: 53daf4e3bc
Former-commit-id: a774213fa9
|
2014-07-30 14:03:51 -04:00 |
|
Juliya Dynina
|
f5e56eaa4f
|
Merge "ASM #15648 Change to Cities.xml" into asm_14.2.2
Former-commit-id: 80d2e23e4f [formerly 6f2a585d52 ] [formerly 92e7f244fc ] [formerly 92e7f244fc [formerly fc27de56d2 ]] [formerly 80d2e23e4f [formerly 6f2a585d52 ] [formerly 92e7f244fc ] [formerly 92e7f244fc [formerly fc27de56d2 ]] [formerly 37587144c0 [formerly 92e7f244fc [formerly fc27de56d2 ] [formerly 37587144c0 [formerly 264920b8af1b2665b17c1015afe02e6f4a719419]]]]]
Former-commit-id: 37587144c0
Former-commit-id: 87c17fe44b [formerly a48f0280eb ] [formerly 984ca28f1b ] [formerly 5d1dfcb2cbba7d2e4fee169e12cbb588d67c4092 [formerly a88a932f463ca39e677ed87524fd4e075bf38a76] [formerly 984ca28f1b [formerly 6cf910a1e7 ]]]
Former-commit-id: cf61ce90e8983994336b3b525eefbbeb8da2540e [formerly 66429b93e014d0522c831d13fcc0cae26415ec8a] [formerly e044393934 [formerly 4d19f304ed ]]
Former-commit-id: 5ae6e7c1439fd7def147cc7da99498c53e444d03 [formerly e044393934 ]
Former-commit-id: fa91081892
|
2014-07-30 07:48:43 -05:00 |
|
Daniel.Huffman
|
3482bd1bfe
|
ASM #15648 Change to Cities.xml
Change-Id: Idc89484cf45fcd1fb30538119d254ed9c0fd79e2
Former-commit-id: beea9e5625 [formerly 0604b6151f ] [formerly 008255ad0e ] [formerly 008255ad0e [formerly aca63e248f ]] [formerly beea9e5625 [formerly 0604b6151f ] [formerly 008255ad0e ] [formerly 008255ad0e [formerly aca63e248f ]] [formerly ea11c48008 [formerly 008255ad0e [formerly aca63e248f ] [formerly ea11c48008 [formerly 1e2b8582fa4dec428b70a2e8aaa1e401ddbfcee7]]]]]
Former-commit-id: ea11c48008
Former-commit-id: fe142c87d8 [formerly b79a4b2686 ] [formerly cf2df78596 ] [formerly e70784cc840f9becb092dd03e8a9fd31fa84ea98 [formerly 689c437b5ef83791d3726fa3d228f4816af33e7e] [formerly cf2df78596 [formerly e9986b7316 ]]]
Former-commit-id: 363dfa675b77ad43d1cad9f36ce823bd5f64b367 [formerly ba2ae1bb399fc8a6cb27ee1d0e6f856b40eb1186] [formerly 11de63b4f0 [formerly e9f98275bd ]]
Former-commit-id: 11de63b4f0
Former-commit-id: 730815ac4e
|
2014-07-29 21:41:00 +00:00 |
|
Kiran.Shrestha
|
d2694a9cb3
|
ASM #97 - Freezing Level Height AGL for all models has units of dam instead of feet
Change-Id: Ib92fbb1c153a8a4739371d8148673a5e32ea36f9
Former-commit-id: 5e7b746609 [formerly d7c8a9a458 ] [formerly e9a417f5f8 ] [formerly e9a417f5f8 [formerly a044b44c8b ]] [formerly 5e7b746609 [formerly d7c8a9a458 ] [formerly e9a417f5f8 ] [formerly e9a417f5f8 [formerly a044b44c8b ]] [formerly 11bab40785 [formerly e9a417f5f8 [formerly a044b44c8b ] [formerly 11bab40785 [formerly 1730a6dea78cfd922b59c6cccc1c6f44d3a56949]]]]]
Former-commit-id: 11bab40785
Former-commit-id: 83251ffc05 [formerly f544c8e64f ] [formerly fe32fc419a ] [formerly 90b8d58454298caed625b2a2636db9f4393e464b [formerly 4b133e12715365fa25363fcbb64628b8c3ce4aef] [formerly fe32fc419a [formerly d32c2739cf ]]]
Former-commit-id: 7f27adc02b5458d771303e917dc5ae0b723ad7f1 [formerly 3d2329fbc6c7d4a188ca052d16d44e1b65c7c8b1] [formerly fa984fd8a4 [formerly 2c2ad03ee5 ]]
Former-commit-id: fa984fd8a4
Former-commit-id: 32da13ecc3
|
2014-07-28 16:18:39 -04:00 |
|
Michael Gamazaychikov
|
d9cf1fb328
|
ASM #15627 - WarnGen leaving out reference to State that is under SVR or TOR Watch in SPS text products.
Change-Id: Ic5689db7714be086d6e4543602db33a07e5b2fc1
Former-commit-id: c599b2cb12 [formerly c71189dd92 ] [formerly e24dd6958e ] [formerly e24dd6958e [formerly ba4c386f30 ]] [formerly c599b2cb12 [formerly c71189dd92 ] [formerly e24dd6958e ] [formerly e24dd6958e [formerly ba4c386f30 ]] [formerly 8cffe955a9 [formerly e24dd6958e [formerly ba4c386f30 ] [formerly 8cffe955a9 [formerly 00ec5e2d47809d084b3e24e1f1503af96d129fed]]]]]
Former-commit-id: 8cffe955a9
Former-commit-id: fa489aab36 [formerly 4c4132f0aa ] [formerly f186b49e92 ] [formerly 3220574e1d666bde198a509ef6cce456cbfafc3c [formerly ff7f89fdff34c0527901d834458ee4e10d6f19f3] [formerly f186b49e92 [formerly bb7b43be49 ]]]
Former-commit-id: 4a26576f017d217cb1d48e565d57a1e8f6794d36 [formerly 6829c833cd21836bdce90d24a801642877a0b282] [formerly cc3172ead3 [formerly 134b1286fc ]]
Former-commit-id: cc3172ead3
Former-commit-id: b280c3f5c7
|
2014-07-28 15:12:10 -04:00 |
|
Qinglu.Lin
|
e3fac4f357
|
ASM #15554 - Improve speed/efficiency of WarngenLayer.populateStrings
Change-Id: I6a3b9823ac7c23ba171206708187ab3fc3c7c1ca
Former-commit-id: 85c418c0f4 [formerly 632ec498ff ] [formerly f69a06238b ] [formerly f69a06238b [formerly 1eca5ef51a ]] [formerly 85c418c0f4 [formerly 632ec498ff ] [formerly f69a06238b ] [formerly f69a06238b [formerly 1eca5ef51a ]] [formerly 2aa16c114a [formerly f69a06238b [formerly 1eca5ef51a ] [formerly 2aa16c114a [formerly 3b971d52a82099142fe08986df879a379dfa6314]]]]]
Former-commit-id: 2aa16c114a
Former-commit-id: 9a896e73bc [formerly 3cdad48a5d ] [formerly 28842008ec ] [formerly 265cb3ecda1e0a647d8c570112e8c8e4a205c839 [formerly 0530943e480469d1125783c548c7f3e20af3002b] [formerly 28842008ec [formerly 80c41d8904 ]]]
Former-commit-id: 7ec89c574c085fd10f3f22f12477377b31dbabf7 [formerly eb074bc63aab17207cd6f4a5ebca29b3dd524c6a] [formerly 000daa2716 [formerly b3b4c058aa ]]
Former-commit-id: 000daa2716
Former-commit-id: 7f7869a810
|
2014-07-28 12:36:07 -04:00 |
|
Rici.Yu
|
b9b9e7169a
|
ASM #15655 - Negate raising exception for empty db from IFPDB()
Change-Id: I5c96d654f3080a4b0f10113648f290a0d09961cb
Former-commit-id: 0723f72b44 [formerly 9b78be1622 ] [formerly a75c0c2f15 ] [formerly a75c0c2f15 [formerly 9a1310d1ac ]] [formerly 0723f72b44 [formerly 9b78be1622 ] [formerly a75c0c2f15 ] [formerly a75c0c2f15 [formerly 9a1310d1ac ]] [formerly 661737fb39 [formerly a75c0c2f15 [formerly 9a1310d1ac ] [formerly 661737fb39 [formerly 9af51efbef229984de09a5ad338885d54f720270]]]]]
Former-commit-id: 661737fb39
Former-commit-id: b9d9f8a0b5 [formerly e2b9936e38 ] [formerly bacd423e0e ] [formerly 65826bd559a019059a1afff54718810dbadec631 [formerly bfb83b4cc16a3ed2c99c3583195dd3cd54445b2e] [formerly bacd423e0e [formerly 60116edbcc ]]]
Former-commit-id: a9b0e4d7bd8756d2b54ea9cf509321f912c5f290 [formerly 41dcdd610046cb473cb5e7ead7c1e8f22535bb80] [formerly 53691c3cd3 [formerly af5d129375 ]]
Former-commit-id: 7027a746a01e76142aedb0e76c4d11e4db288ddd [formerly 53691c3cd3 ]
Former-commit-id: 593d722c22
|
2014-07-28 11:30:49 -04:00 |
|
Ron Anderson
|
9b6e463819
|
Issue #3423 Move alarm/alert product requests off UI thread
Change-Id: I44149b5af54fbeac75231d6caeb3929fbf6ecf5e
Former-commit-id: 9df21f4c1c [formerly be5794d464 ] [formerly ac0799ce35 ] [formerly ac0799ce35 [formerly 17b681f355 ]] [formerly 9df21f4c1c [formerly be5794d464 ] [formerly ac0799ce35 ] [formerly ac0799ce35 [formerly 17b681f355 ]] [formerly 174d8b59e0 [formerly ac0799ce35 [formerly 17b681f355 ] [formerly 174d8b59e0 [formerly c3401cee78edae8dea6d21736fac25bfed996fb3]]]]]
Former-commit-id: 174d8b59e0
Former-commit-id: 2314dc22ce [formerly 4195c36f08 ] [formerly 3da914cf97 ] [formerly 72f9e22e82662f3f24aaf22142614dae5a526e6b [formerly f037b9fe395c757a1cf7c40690b05cf533498d43] [formerly 3da914cf97 [formerly 64ba8b1c1a ]]]
Former-commit-id: 74a7e13f516d6e803d680da5daf5235ea123082b [formerly d640dce651f9095068c4d3a337094bc506763e2a] [formerly e9b0d50ee9 [formerly 243decf322 ]]
Former-commit-id: e9b0d50ee9
Former-commit-id: 2f327c8d03
|
2014-07-24 14:02:10 -05:00 |
|
Steve Harris
|
23b7027b6b
|
Merge branch 'master_14.2.2' (14.2.2-22) into omaha_14.2.2
Former-commit-id: 70fb592f69 [formerly 07e2a77ce4 ] [formerly 943a8270d8 ] [formerly 943a8270d8 [formerly a14b996684 ]] [formerly 70fb592f69 [formerly 07e2a77ce4 ] [formerly 943a8270d8 ] [formerly 943a8270d8 [formerly a14b996684 ]] [formerly 7d90ae4468 [formerly 943a8270d8 [formerly a14b996684 ] [formerly 7d90ae4468 [formerly 6a7f00f07d1ee3e9f39b299306083228eb5adb18]]]]]
Former-commit-id: 7d90ae4468
Former-commit-id: 8f98608ce7 [formerly 6a9569f6bc ] [formerly da07f657f8 ] [formerly 84963a520de56024452343a12584aff2e1260122 [formerly 6f8b12bcbb7d40d8cdccdee19dad66923fd23443] [formerly da07f657f8 [formerly 05e49db6b5 ]]]
Former-commit-id: 16242b5f810939c069da4108ced21cc01e953689 [formerly a7a46c63e5797e7e73fbc909410074d9b01cf8bb] [formerly 58ac517c57 [formerly bb68ca550a ]]
Former-commit-id: 58ac517c57
Former-commit-id: a98468982a
|
2014-07-24 11:35:24 -05:00 |
|
Brian.Dyke
|
f9382b5a45
|
Merge branch 'master_14.2.2' into asm_14.2.2
Former-commit-id: 59c6cbd8b2 [formerly 6fe1fbbd47 ] [formerly cd099c0902 ] [formerly cd099c0902 [formerly cef9771fe1 ]] [formerly 59c6cbd8b2 [formerly 6fe1fbbd47 ] [formerly cd099c0902 ] [formerly cd099c0902 [formerly cef9771fe1 ]] [formerly 3d6c40b341 [formerly cd099c0902 [formerly cef9771fe1 ] [formerly 3d6c40b341 [formerly 69c55eff70bbfb445bdd9bf708ed5e4df896b42a]]]]]
Former-commit-id: 3d6c40b341
Former-commit-id: c0cf37ba2f [formerly 9412ecfbcd ] [formerly 3f9cbad089 ] [formerly 7348aaa470f840b761db9f1052659c962ca9358a [formerly 9b879712065ef77da8b18f6e3e6fb1e4bbd5fc73] [formerly 3f9cbad089 [formerly 5eebb40e76 ]]]
Former-commit-id: 75f8891da0a7fed2467f2705f72572abd2374cd7 [formerly 761316a1a8a075a266b9b5be87ec51020b163276] [formerly 3b1020701c [formerly a6ac0d4696 ]]
Former-commit-id: 3b1020701c
Former-commit-id: b464646b8f
|
2014-07-24 09:03:57 -04:00 |
|
Brian.Dyke
|
59343ee8d6
|
Merge branch 'omaha_14.2.2' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.2.2
Former-commit-id: 749e85b4e3 [formerly ff85bf3855 ] [formerly 80ebce9354 ] [formerly 80ebce9354 [formerly ff4e52fc75 ]] [formerly 749e85b4e3 [formerly ff85bf3855 ] [formerly 80ebce9354 ] [formerly 80ebce9354 [formerly ff4e52fc75 ]] [formerly 6f47712e32 [formerly 80ebce9354 [formerly ff4e52fc75 ] [formerly 6f47712e32 [formerly df900c3156da1ed48c512fe4b1356c4b4301ad5f]]]]]
Former-commit-id: 6f47712e32
Former-commit-id: a1c9474ddb [formerly 074e5625d7 ] [formerly 402ad0ffc1 ] [formerly 29655d5221bcd60effffc057534a0d0e41876144 [formerly d548a2b6687a6c95659b14ac38120af8a06e503d] [formerly 402ad0ffc1 [formerly bdd5b3b00b ]]]
Former-commit-id: f7bd650c93c58d429daf0e38801f73bc2a402fd7 [formerly 0ba573a807484826f47bd829c16511ed7db037d6] [formerly 2a2b44393c [formerly 4f6fb953dd ]]
Former-commit-id: 2a2b44393c
Former-commit-id: a79ccb4e2d
|
2014-07-23 16:46:09 -04:00 |
|