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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
Brian.Dyke
|
29bc56c37f
|
Merge branch 'asm_14.2.2' into master_14.2.2
Former-commit-id: eeca2f2ec8 [formerly 3598f7b549] [formerly eeca2f2ec8 [formerly 3598f7b549] [formerly 905728d2fb [formerly 96ff2234e0d8893695b33a79d24a026a1a409073]]]
Former-commit-id: 905728d2fb
Former-commit-id: 370b180653 [formerly e3745633a3]
Former-commit-id: f5030dfeb5
|
2014-07-31 09:56:21 -04:00 |
|
Shawn.Hooper
|
53daf4e3bc
|
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 e24dd6958e [formerly ba4c386f30] [formerly e24dd6958e [formerly ba4c386f30] [formerly 8cffe955a9 [formerly 00ec5e2d47809d084b3e24e1f1503af96d129fed]]]].
Change-Id: Ie01ca9463a4db371ffce0b6e38d5c43e1f9addf2
Former-commit-id: 27f50397aa [formerly 976c7b2d4a] [formerly 27f50397aa [formerly 976c7b2d4a] [formerly 4e322737ce [formerly d272d426f8bd218954a75a7b2e19d21b30f975cb]]]
Former-commit-id: 4e322737ce
Former-commit-id: af19d9f9c4 [formerly fe0fffe51b]
Former-commit-id: 17ac974932
|
2014-07-30 14:03:51 -04:00 |
|
Juliya Dynina
|
e044393934
|
Merge "ASM #15648 Change to Cities.xml" into asm_14.2.2
Former-commit-id: 92e7f244fc [formerly fc27de56d2] [formerly 92e7f244fc [formerly fc27de56d2] [formerly 37587144c0 [formerly 264920b8af1b2665b17c1015afe02e6f4a719419]]]
Former-commit-id: 37587144c0
Former-commit-id: 984ca28f1b [formerly 6cf910a1e7]
Former-commit-id: 4d19f304ed
|
2014-07-30 07:48:43 -05:00 |
|
Daniel.Huffman
|
11de63b4f0
|
ASM #15648 Change to Cities.xml
Change-Id: Idc89484cf45fcd1fb30538119d254ed9c0fd79e2
Former-commit-id: 008255ad0e [formerly aca63e248f] [formerly 008255ad0e [formerly aca63e248f] [formerly ea11c48008 [formerly 1e2b8582fa4dec428b70a2e8aaa1e401ddbfcee7]]]
Former-commit-id: ea11c48008
Former-commit-id: cf2df78596 [formerly e9986b7316]
Former-commit-id: e9f98275bd
|
2014-07-29 21:41:00 +00:00 |
|
Michael Gamazaychikov
|
cc3172ead3
|
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: e24dd6958e [formerly ba4c386f30] [formerly e24dd6958e [formerly ba4c386f30] [formerly 8cffe955a9 [formerly 00ec5e2d47809d084b3e24e1f1503af96d129fed]]]
Former-commit-id: 8cffe955a9
Former-commit-id: f186b49e92 [formerly bb7b43be49]
Former-commit-id: 134b1286fc
|
2014-07-28 15:12:10 -04:00 |
|
Qinglu.Lin
|
000daa2716
|
ASM #15554 - Improve speed/efficiency of WarngenLayer.populateStrings
Change-Id: I6a3b9823ac7c23ba171206708187ab3fc3c7c1ca
Former-commit-id: f69a06238b [formerly 1eca5ef51a] [formerly f69a06238b [formerly 1eca5ef51a] [formerly 2aa16c114a [formerly 3b971d52a82099142fe08986df879a379dfa6314]]]
Former-commit-id: 2aa16c114a
Former-commit-id: 28842008ec [formerly 80c41d8904]
Former-commit-id: b3b4c058aa
|
2014-07-28 12:36:07 -04:00 |
|
Ron Anderson
|
e9b0d50ee9
|
Issue #3423 Move alarm/alert product requests off UI thread
Change-Id: I44149b5af54fbeac75231d6caeb3929fbf6ecf5e
Former-commit-id: ac0799ce35 [formerly 17b681f355] [formerly ac0799ce35 [formerly 17b681f355] [formerly 174d8b59e0 [formerly c3401cee78edae8dea6d21736fac25bfed996fb3]]]
Former-commit-id: 174d8b59e0
Former-commit-id: 3da914cf97 [formerly 64ba8b1c1a]
Former-commit-id: 243decf322
|
2014-07-24 14:02:10 -05:00 |
|
Zhidong.Hao
|
2a4ea1243c
|
ASM #15645 - Fix for AvnFPS: TAF syntax check fails when equal sign is missing
Change-Id: I1a4fb9be1253b4655bd43674aab4a4ddcf6d0ce7
Former-commit-id: d7cce22d02 [formerly 26c4bb2414] [formerly d7cce22d02 [formerly 26c4bb2414] [formerly a3cda853cf [formerly 192948e00538bcf0dfc0aaf20ea1dcb216313ffb]]]
Former-commit-id: a3cda853cf
Former-commit-id: ee2f893d21 [formerly eef5191d1c]
Former-commit-id: 350028e069
|
2014-07-23 14:37:28 -04:00 |
|
Steve Harris
|
a980faab73
|
Merge branch 'master_14.2.2' (14.2.2-21) into omaha_14.2.2
Former-commit-id: 619ed933ac [formerly eaa4456fa7] [formerly 619ed933ac [formerly eaa4456fa7] [formerly 35130cb3f5 [formerly 2c17b02a196584edbaa2cef33d8e9adc91567f8e]]]
Former-commit-id: 35130cb3f5
Former-commit-id: ab6fad008f [formerly 0da15f729e]
Former-commit-id: 9b3af6a2dd
|
2014-07-23 13:07:11 -05:00 |
|
Jonathan Sanchez
|
e4268f814e
|
Issue #3419 Refactored watches to use the county table.
Change-Id: Ide7e07813203213511640d5ee515e73b278089c1
Former-commit-id: 997485dd22 [formerly 86a8ca4a30] [formerly 997485dd22 [formerly 86a8ca4a30] [formerly b991838494 [formerly 135d7ffa84af58d7b3c9575e654fa1298b76b2e2]]]
Former-commit-id: b991838494
Former-commit-id: f7bc9a8023 [formerly 025c29acc0]
Former-commit-id: 56cbd23141
|
2014-07-22 15:32:12 -05:00 |
|
Steve Harris
|
3b5fc91579
|
Merge branch 'master_14.2.2' into omaha_14.2.2
Former-commit-id: 7b0b043c67 [formerly bce7039508] [formerly 7b0b043c67 [formerly bce7039508] [formerly 8a7ea92c2b [formerly c0033681d38af55bff79efbceec119606fcc5c2f]]]
Former-commit-id: 8a7ea92c2b
Former-commit-id: 7a4111b29f [formerly 0314663e95]
Former-commit-id: e24b5a2fec
|
2014-07-22 10:26:33 -05:00 |
|
Brian.Dyke
|
b77d938e42
|
Merge branch 'omaha_14.2.2' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.2.2
Former-commit-id: 9ef7783251 [formerly e55b892fc3] [formerly 9ef7783251 [formerly e55b892fc3] [formerly c26e0cd548 [formerly 499b825592fdbdf150c918e5f3abacc4f37ddd70]]]
Former-commit-id: c26e0cd548
Former-commit-id: efff77a72c [formerly a3618e103e]
Former-commit-id: 3e66c55f09
|
2014-07-21 11:18:25 -04:00 |
|
David Friedman
|
4bdc4d4297
|
ASM #15049 - LAPS time matching problem
Change-Id: I52eee87defb407b741208e183b9829558bfa6733
Former-commit-id: 6aebd3a19b [formerly ec25c44fe7] [formerly 6aebd3a19b [formerly ec25c44fe7] [formerly 188e25d2e7 [formerly 624c3a4225910863d5cc0b795493a39c0422a3e3]]]
Former-commit-id: 188e25d2e7
Former-commit-id: e73a125fd9 [formerly 93a57dafea]
Former-commit-id: 9efbcdf0b2
|
2014-07-18 17:06:05 +00:00 |
|
Nate Jensen
|
18439faeb9
|
Issue #2954 actually log when the scalesInfo.xml cannot be parsed before
falling back to the base version
Change-Id: I2df669504061160c6ace76560f07845f99a80912
Former-commit-id: 82bef00378 [formerly da731be2f7] [formerly 82bef00378 [formerly da731be2f7] [formerly 2a01b1ebcd [formerly 894e6ac1db5b34e6466c68aefa5877b9405bfd59]]]
Former-commit-id: 2a01b1ebcd
Former-commit-id: ecff8cddf2 [formerly 95731087ed]
Former-commit-id: eec604da0d
|
2014-07-17 13:27:48 -05:00 |
|
Nate Jensen
|
a559ae9796
|
Issue #2954 fall back to existing map scales if map scale is missing
Change-Id: I75083325edec689c38f2fe7661c635ddf3e0f527
Former-commit-id: c07802a208 [formerly 6e21526fd2] [formerly c07802a208 [formerly 6e21526fd2] [formerly ed9bee5533 [formerly c7167ad2f59ba02edc842f321d12cd36cd6da8bb]]]
Former-commit-id: ed9bee5533
Former-commit-id: 12aa82ee3f [formerly d07ec00b92]
Former-commit-id: 61b8abe589
|
2014-07-15 18:27:09 -05:00 |
|
steve.naples
|
db04c1a2ec
|
ASM #253 Update RadarBiasTableDialog fix issue of not saving undo.
Change-Id: I57ad9d4407665fd4c5f7e922cbf3daac373c9f88
Former-commit-id: 2ebfd61f12 [formerly 339fcbc18a] [formerly 2ebfd61f12 [formerly 339fcbc18a] [formerly 0bd7b6c65b [formerly 24b9a6e0801cc653062a71d86090df3836aa86a4]]]
Former-commit-id: 0bd7b6c65b
Former-commit-id: 6b58fb2509 [formerly aa8c11d134]
Former-commit-id: 458dd1fe8f
|
2014-07-09 15:42:51 +00:00 |
|
Ron Anderson
|
a1a980ed6e
|
Issue #3332 Fixed race condition which could cause GFE grid saving to hang
Change-Id: I4a2ef9e25999d95ac1ecf204907c59b2f1e85652
Former-commit-id: 4b4629a2fd [formerly 111b04296c] [formerly 4b4629a2fd [formerly 111b04296c] [formerly 5efba03474 [formerly b01b72b896b894568acce6a8dc4d45328a06067a]]]
Former-commit-id: 5efba03474
Former-commit-id: e39615ab7a [formerly 1cc0ff4ab7]
Former-commit-id: 0a7c4c855e
|
2014-07-09 08:56:06 -05:00 |
|
steve.naples
|
10e2eaa6ed
|
ASM #253 Update RadarBiasTableDialog fix issue of not saving.
Change-Id: If88c12673afeb3ae8cecfb53d856bc90820a4673
Former-commit-id: 29ca2338b8 [formerly 75969ceec2] [formerly 29ca2338b8 [formerly 75969ceec2] [formerly 24b0d49a5b [formerly 9021eca6b32dd2b3859cd928c14a0e40a4907c13]]]
Former-commit-id: 24b0d49a5b
Former-commit-id: 94e246b619 [formerly ea071e81f5]
Former-commit-id: 23ff3f3fe7
|
2014-07-08 16:32:08 +00:00 |
|
Brian.Dyke
|
f14f792377
|
Merge branch 'asm_14.2.2' of winter:/data/gerrit2/git/AWIPS2_baseline into master_14.2.2
Former-commit-id: a33fdeb558 [formerly 2ef4767652] [formerly a33fdeb558 [formerly 2ef4767652] [formerly 89c0457b1d [formerly 845aebda9d8af143e3a6828c066b291e0343a020]]]
Former-commit-id: 89c0457b1d
Former-commit-id: 6be18f0dd4 [formerly a2dc10847c]
Former-commit-id: e9e9abd3db
|
2014-07-07 13:33:35 -04:00 |
|
David Friedman
|
c44e9f88f6
|
ASM #15052 - WarnGen: service backup should use config.xml from failed site
Change-Id: Icff8ca2a124da595be6b83ac9f9999831daee0b1
Former-commit-id: 8784501bba [formerly a45fe1dad0] [formerly 8784501bba [formerly a45fe1dad0] [formerly db8977e281 [formerly f9c0dc09ee7bc692c6f70b4a5ad67bb2c2ed5a20]]]
Former-commit-id: db8977e281
Former-commit-id: 5270711c5d [formerly d36834080e]
Former-commit-id: 4f53bbd556
|
2014-07-03 13:58:24 +00:00 |
|
Juliya Dynina
|
d3073a02a7
|
Merge "ASM #253 Update RadarBiasTableDialog to remove old code." into asm_14.2.2
Former-commit-id: 67580e73cd [formerly 244b2f5f3a] [formerly 67580e73cd [formerly 244b2f5f3a] [formerly 470d50b4e4 [formerly d6ae0d12f104de38b8fa770e4576b96a32da360c]]]
Former-commit-id: 470d50b4e4
Former-commit-id: d705c8c8a4 [formerly b1cec7d40e]
Former-commit-id: 3f043077b3
|
2014-07-02 14:17:11 -05:00 |
|
Steve Harris
|
a19a11998f
|
Merge branch 'master_14.2.2' (14.2.2-17,18) into omaha_14.2.2
Former-commit-id: 9b7f820b06 [formerly 136af3f7e2] [formerly 9b7f820b06 [formerly 136af3f7e2] [formerly 0ef8a057f9 [formerly c88d3136dbadab41df5fbf37b4b7c821dfcd07d9]]]
Former-commit-id: 0ef8a057f9
Former-commit-id: cb8192cfaf [formerly 9f61f60f65]
Former-commit-id: a12a736737
|
2014-07-02 13:38:08 -05:00 |
|
steve.naples
|
9f52699bd2
|
ASM #253 Update RadarBiasTableDialog to remove old code.
Change-Id: I003f8dbf520e1e8025afe46266d1ee4849003a6f
Former-commit-id: 3d75da3db0 [formerly 66c3241bc4] [formerly 3d75da3db0 [formerly 66c3241bc4] [formerly 4e959af1b4 [formerly b9f868e0ced53987accf675bfe2ce1a1f4f34da1]]]
Former-commit-id: 4e959af1b4
Former-commit-id: f1c92f1e35 [formerly 3cfabd29bc]
Former-commit-id: 93c8f822cc
|
2014-07-02 15:30:48 +00:00 |
|
Nate Jensen
|
b54a9694ee
|
Issue #3337 disable logback packaging data in cave
Former-commit-id: 56363ffc4a [formerly c003d70168] [formerly 56363ffc4a [formerly c003d70168] [formerly 939fde1575 [formerly db10ba5a37dbe219110f4f902bf9257f2f220b3d]]]
Former-commit-id: 939fde1575
Former-commit-id: c421e2de75 [formerly a2cfcd8716]
Former-commit-id: 75ffabbcc2
|
2014-07-02 09:24:15 -05:00 |
|
Juliya Dynina
|
5a9181fcc1
|
Merge "ASM #663 - WarnGen does not properly handle Outer Banks Counties in North Carolina" into asm_14.2.2
Former-commit-id: bf765525b7 [formerly b5e4bc1fdc] [formerly bf765525b7 [formerly b5e4bc1fdc] [formerly 102da2d0f7 [formerly 714dbccbd26a1b6fafa486b2ddbce98d7f38c8eb]]]
Former-commit-id: 102da2d0f7
Former-commit-id: b4d23902a7 [formerly 7ed2a8cbd4]
Former-commit-id: 8f3581340b
|
2014-07-01 10:05:57 -05:00 |
|
Qinglu.Lin
|
7235488050
|
ASM #663 - WarnGen does not properly handle Outer Banks Counties in North Carolina
Change-Id: If7fbcea362618e0dea5153f65489388b406b7a81
Former-commit-id: 1180b31875 [formerly 1200633cd2] [formerly 1180b31875 [formerly 1200633cd2] [formerly 1d52d020eb [formerly 4d50beaed59d785d923e357f8ce036f6625ce4b4]]]
Former-commit-id: 1d52d020eb
Former-commit-id: 5e07f13dd8 [formerly 6e4b7e1e6d]
Former-commit-id: 3eaedad105
|
2014-06-30 13:09:15 -04:00 |
|
David Friedman
|
18b1d17550
|
ASM #660 - WarnGen can generate polygons that do not match hatched area
Change-Id: I48e93e69d75e903b266f5bb615dd8a72e8813652
Former-commit-id: c4967a96fb [formerly 18b3b61afc] [formerly c4967a96fb [formerly 18b3b61afc] [formerly dc25040a25 [formerly 993663cbee3f794981fc7f4cc97f96e3b86c47f8]]]
Former-commit-id: dc25040a25
Former-commit-id: 217aa6ce76 [formerly b546ca6ac8]
Former-commit-id: a756c1436b
|
2014-06-27 19:17:55 +00:00 |
|
Brian.Dyke
|
a1d171c6c3
|
Merge branch 'master_14.2.2' into asm_14.2.2
Former-commit-id: a48268a1d6 [formerly a5ae302690] [formerly a48268a1d6 [formerly a5ae302690] [formerly 3df14b5a94 [formerly 632577244e843dd122c00b745e973730c7920246]]]
Former-commit-id: 3df14b5a94
Former-commit-id: 88411f7f52 [formerly 97619031c9]
Former-commit-id: 9197f47f29
|
2014-06-26 10:39:49 -04:00 |
|
Steve Harris
|
2841134c60
|
Merge branch 'master_14.2.2' (master_14.2.2-15) into omaha_14.2.2
Former-commit-id: 3f2058a1ab [formerly 89606076ec] [formerly 3f2058a1ab [formerly 89606076ec] [formerly ddc6f2092a [formerly 174fe6d66525229f328846a1f4564300d7603c10]]]
Former-commit-id: ddc6f2092a
Former-commit-id: 304d918a7c [formerly 1f033d22e6]
Former-commit-id: 323c240f59
|
2014-06-24 10:57:56 -05:00 |
|
steve.naples
|
3638879057
|
ASM #253 Update RadarBiasTableDialog to allow undo changes.
Change-Id: Ibfb87730fda8185b27777fd83606bc1397aca1f9
Former-commit-id: 2a49bbda2f [formerly efe877d82b] [formerly 2a49bbda2f [formerly efe877d82b] [formerly 90ed511478 [formerly fcd20d35abf3617701cc797baf9ba2b3984379c8]]]
Former-commit-id: 90ed511478
Former-commit-id: 2e77b74c44 [formerly 362e1ce880]
Former-commit-id: 5dcda5cabc
|
2014-06-24 15:52:23 +00:00 |
|
Nate Jensen
|
b1ab93a361
|
Issue #3307 fix xml serialization of looping field
Former-commit-id: c7c0d9cb4b [formerly 51da67dd3f] [formerly c7c0d9cb4b [formerly 51da67dd3f] [formerly 97ef9fc343 [formerly c6ce72840a4ee0f44eacff46015b5382d86dd47f]]]
Former-commit-id: 97ef9fc343
Former-commit-id: 416e6fc85d [formerly a3c20eb98a]
Former-commit-id: 9a3a4d5bfd
|
2014-06-23 09:54:11 -05:00 |
|
Steve Harris
|
196f53e609
|
CM-MERGE:14.1.3-2,-3 into 14.2.2
Merge branch 'master_14.1.3' (-3) into master_14.2.2 (-14)
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-request.xml
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/spc/SPCWatchSrv.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/tpc/TPCWatchSrv.java
edexOsgi/com.raytheon.edex.plugin.gfe/test/com/raytheon/edex/plugin/gfe/watch/TestWCLWatchSrv.java
edexOsgi/com.raytheon.edex.plugin.warning/WarningDecoder.py
edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/gis/GeospatialFactory.java
Former-commit-id: 16f5ff0979 [formerly b84dda5930] [formerly 16f5ff0979 [formerly b84dda5930] [formerly 419c5f4aba [formerly ce5767f2bbf5c9627bd43e766c6193c261c48af3]]]
Former-commit-id: 419c5f4aba
Former-commit-id: af06c5a890 [formerly 66d30e59a3]
Former-commit-id: 935542914d
|
2014-06-20 14:01:55 -04:00 |
|
Brian.Dyke
|
b602d29456
|
CM-MERGE:OB13.5.6-4 into 14.1.3
Former-commit-id: be589ceb9b [formerly 399c06820a] [formerly be589ceb9b [formerly 399c06820a] [formerly 8ecdd9a192 [formerly 86dc406cd227362abc5274f4cd64813ceb91d00d]]]
Former-commit-id: 8ecdd9a192
Former-commit-id: e28febcf27 [formerly 9031f58d02]
Former-commit-id: 3e10995d87
|
2014-06-18 08:55:49 -04:00 |
|
Brian.Dyke
|
03f8202ff2
|
CM-MERGE:OB13.5.6-3 into 14.1.3
Merge branch 'master_14.1.3_merge' into master_14.1.3
Former-commit-id: 06c565d74f [formerly 30d8644fa5] [formerly 06c565d74f [formerly 30d8644fa5] [formerly 482f915b42 [formerly 4b317062ce5c35823210cbbf023c0f0fc8051ef3]]]
Former-commit-id: 482f915b42
Former-commit-id: c1bd7a0c55 [formerly 072a4a9d63]
Former-commit-id: ce9ebc90f5
|
2014-06-13 14:05:49 -04:00 |
|
Brian.Dyke
|
3da13f3d12
|
CM-MERGE:OB13.5.6-3 into 14.1.3
Former-commit-id: 5064d24e26 [formerly 346bf852cd] [formerly 5064d24e26 [formerly 346bf852cd] [formerly 81832d97e5 [formerly df99fcb0a4be27d5f2d22935847fb55b8bfbbb58]]]
Former-commit-id: 81832d97e5
Former-commit-id: 764b729546 [formerly 4bca0769fb]
Former-commit-id: 766974a05d
|
2014-06-13 13:21:19 -04:00 |
|
David Friedman
|
3b686ca052
|
ASM #604 - Lightning display varies depending how long CAVE has been open
Change-Id: Id85b87e21833ef00e80693b8526d976ccb4bb63e
Former-commit-id: 6d0d3f5ba5 [formerly b8542c1332] [formerly 6d0d3f5ba5 [formerly b8542c1332] [formerly 1c84c31e30 [formerly a3f4fd6537f3847011e199e0f043968d9f595937]]]
Former-commit-id: 1c84c31e30
Former-commit-id: 0ba91c6c28 [formerly 8c8f54994b]
Former-commit-id: d50646b479
|
2014-06-11 13:37:16 +00:00 |
|
Brian.Dyke
|
1ae1410e46
|
Merge branch 'master_14.1.3' into master_14.2.2 CM-MERGE:14.1.3-1 into 14.2.2
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
Former-commit-id: 0f07e14bf1 [formerly f72380ad60] [formerly 0f07e14bf1 [formerly f72380ad60] [formerly 9ab17ddecb [formerly 797aa6bfbf2802aa7355b7a4a77d0fb4f54dfd6a]]]
Former-commit-id: 9ab17ddecb
Former-commit-id: 816dcf74e4 [formerly 49cd9574d9]
Former-commit-id: a4b39dfca5
|
2014-06-10 13:56:03 -04:00 |
|
Brian.Dyke
|
a39afc1dfa
|
CM-MERGE:OB13.5.6-1,-2 into 14.1.3
Former-commit-id: ef5c74dece [formerly c1b3f9d180] [formerly ef5c74dece [formerly c1b3f9d180] [formerly 8874d41872 [formerly b859032bcec187616adfd414dd1ce5fe27829e9e]]]
Former-commit-id: 8874d41872
Former-commit-id: 4f0fc67b1f [formerly f568b5606a]
Former-commit-id: 81d732477e
|
2014-06-10 12:52:59 -04:00 |
|
Mike Duff
|
bb122607cc
|
ASM #605 - Cherry-pick Omaha Issue #2954 from 14.3.1 into 14.2.2 to fix CAVE not starting if scale bundle is missing.
Change-Id: I3f7159b7a48e74fc9ad7a4220d6c30b67240aca1
Former-commit-id: b876d9755a [formerly 81ab64d7ff] [formerly b876d9755a [formerly 81ab64d7ff] [formerly 39173c380c [formerly 7fe0dae041cb68aba968e22d5895cce22a210ee6]]]
Former-commit-id: 39173c380c
Former-commit-id: 60fe02137f [formerly b880d171d4]
Former-commit-id: 4b9f707a06
|
2014-06-06 16:03:14 -04:00 |
|