Ron Anderson
|
db3a4b1fb3
|
Issue #3415 Fixed d2dGridDataPurged to not purge NetCDF databases.
Change-Id: Ie52a5b8c46d58cb39acde27f0ebdde0c42fdfa67
Former-commit-id: e0bfbb796b [formerly 7903a20dbc] [formerly f3a6393b96] [formerly e0bfbb796b [formerly 7903a20dbc] [formerly f3a6393b96] [formerly 6ea726136b [formerly f3a6393b96 [formerly a2362b68b103c9013d615815924514ebe44be147]]]]
Former-commit-id: 6ea726136b
Former-commit-id: c2ee319ae1 [formerly 07dd567f60] [formerly 2d25a696f9c5848055ea4706f1fa617108ed1801 [formerly b79ebd0508]]
Former-commit-id: 7d65cc86660e90573002904abe1b2c26380e6ee0 [formerly e1b7339a39]
Former-commit-id: a9382653cb
|
2014-07-21 12:47:12 -05:00 |
|
Nate Jensen
|
9d2c3e22db
|
Issue #2954 actually log when the scalesInfo.xml cannot be parsed before
falling back to the base version
Change-Id: I2df669504061160c6ace76560f07845f99a80912
Former-commit-id: 9aa3ba110f [formerly 82bef00378] [formerly da731be2f7] [formerly 9aa3ba110f [formerly 82bef00378] [formerly da731be2f7] [formerly 2a01b1ebcd [formerly da731be2f7 [formerly 894e6ac1db5b34e6466c68aefa5877b9405bfd59]]]]
Former-commit-id: 2a01b1ebcd
Former-commit-id: 0e32ad72ab [formerly ecff8cddf2] [formerly 98418245e306d7bb9d04b03550569274aa13743e [formerly 95731087ed]]
Former-commit-id: b565c825d359b911b961e2fdf66de11743369c78 [formerly eec604da0d]
Former-commit-id: 18439faeb9
|
2014-07-17 13:27:48 -05:00 |
|
Nate Jensen
|
00fb95b9fb
|
Issue #2954 fall back to existing map scales if map scale is missing
Change-Id: I75083325edec689c38f2fe7661c635ddf3e0f527
Former-commit-id: ef72e8e222 [formerly c07802a208] [formerly 6e21526fd2] [formerly ef72e8e222 [formerly c07802a208] [formerly 6e21526fd2] [formerly ed9bee5533 [formerly 6e21526fd2 [formerly c7167ad2f59ba02edc842f321d12cd36cd6da8bb]]]]
Former-commit-id: ed9bee5533
Former-commit-id: 8a296f44dc [formerly 12aa82ee3f] [formerly 1b7296f4e0b0b00a7428592a879e684a9594a9a1 [formerly d07ec00b92]]
Former-commit-id: 0c9f09720e80fe71eeb3ad39fefb92e4902c6206 [formerly 61b8abe589]
Former-commit-id: a559ae9796
|
2014-07-15 18:27:09 -05:00 |
|
Nate Jensen
|
1c149ddffd
|
Issue #3372 make LocalizationStreamHandler thread safe
Change-Id: I208b66fbd2b0bfcd225c3df98f96bcdcf5cb9a88
Former-commit-id: c0d1fe1bd8 [formerly 801ed7154f] [formerly 47bf21d7b5] [formerly c0d1fe1bd8 [formerly 801ed7154f] [formerly 47bf21d7b5] [formerly aaa0ed7ed7 [formerly 47bf21d7b5 [formerly 87d5faa03ea63759a6805ed063174fb09ca4800a]]]]
Former-commit-id: aaa0ed7ed7
Former-commit-id: 7bde94571f [formerly e47111f601] [formerly f0448bcb1f489173c370e7c12059614931e19771 [formerly eeba10c11d]]
Former-commit-id: 50cb46b6707393b4db550e45c2c9a648332f79c0 [formerly a802b19c29]
Former-commit-id: fa9cc74703
|
2014-07-14 09:18:16 -05:00 |
|
Mike Duff
|
960e8ce56c
|
Issue #3370 - Revert "Issue #3370 - Fix for mulitple shef types in same file."
This reverts commit 0d73c880f8b96034bf1f9b443aeb8dfcad2be382 [formerly 30655cf2ca] [formerly 6ce3e57525 [formerly e3b7a99388] [formerly b5b61650d3] [formerly 6ce3e57525 [formerly e3b7a99388] [formerly b5b61650d3] [formerly 30655cf2ca [formerly b5b61650d3 [formerly 0c0b14929f74f2262559a4919171623870139313]]]]].
Former-commit-id: c5a344ac75 [formerly c8bfcd54a3] [formerly a35529bba4] [formerly c5a344ac75 [formerly c8bfcd54a3] [formerly a35529bba4] [formerly 73c75303a8 [formerly a35529bba4 [formerly 43cbf77bb90ba12a6ee11bc35b18c226f9490a88]]]]
Former-commit-id: 73c75303a8
Former-commit-id: f778742aa4 [formerly 6b1031a927] [formerly 01d1b4afe87eefe7fa8a15321568e95cbea343d4 [formerly 6f18256c56]]
Former-commit-id: 28bce5abc620bec275b1452ceb9697a31eb27b13 [formerly 08275089f5]
Former-commit-id: 327f695d0c
|
2014-07-10 16:01:56 -05:00 |
|
Mike Duff
|
107df0dc7c
|
Issue #3370 - Fix for mulitple shef types in same file.
Change-Id: I23110d7887b68ff073afdf61815d7dced9c4a3ad
Former-commit-id: 6ce3e57525 [formerly e3b7a99388] [formerly b5b61650d3] [formerly 6ce3e57525 [formerly e3b7a99388] [formerly b5b61650d3] [formerly 30655cf2ca [formerly b5b61650d3 [formerly 0c0b14929f74f2262559a4919171623870139313]]]]
Former-commit-id: 30655cf2ca
Former-commit-id: 031ee7b5f5 [formerly 7a988c92fa] [formerly 66304b48c28db98c6ef9c79bc64ab65a2cf95669 [formerly 69fb1ccf35]]
Former-commit-id: 8fdf0fbb56028776ff8455c543d6f2b5a36bd7f4 [formerly 2c0488534a]
Former-commit-id: 918b247d79
|
2014-07-10 10:05:05 -05:00 |
|
Ron Anderson
|
57b2705ef7
|
Issue #3332 Fixed race condition which could cause GFE grid saving to hang
Change-Id: I4a2ef9e25999d95ac1ecf204907c59b2f1e85652
Former-commit-id: 10f629428e [formerly 4b4629a2fd] [formerly 111b04296c] [formerly 10f629428e [formerly 4b4629a2fd] [formerly 111b04296c] [formerly 5efba03474 [formerly 111b04296c [formerly b01b72b896b894568acce6a8dc4d45328a06067a]]]]
Former-commit-id: 5efba03474
Former-commit-id: 9691bf2dee [formerly e39615ab7a] [formerly 629e83f9edf01bd52b896613ba791f05dcdcec19 [formerly 1cc0ff4ab7]]
Former-commit-id: 8d831abf9d91162a2834bb4a5f34984776cfb287 [formerly 0a7c4c855e]
Former-commit-id: a1a980ed6e
|
2014-07-09 08:56:06 -05:00 |
|
Brian.Dyke
|
8a2b16fda0
|
Merge branch 'asm_14.2.2' of winter:/data/gerrit2/git/AWIPS2_baseline into master_14.2.2
Former-commit-id: 6ea9a4cc23 [formerly a33fdeb558] [formerly 2ef4767652] [formerly 6ea9a4cc23 [formerly a33fdeb558] [formerly 2ef4767652] [formerly 89c0457b1d [formerly 2ef4767652 [formerly 845aebda9d8af143e3a6828c066b291e0343a020]]]]
Former-commit-id: 89c0457b1d
Former-commit-id: 05693a6e32 [formerly 6be18f0dd4] [formerly db3d46678c921e727f9c882b090df6f420aabdba [formerly a2dc10847c]]
Former-commit-id: ad91e4d3778911324da29cefafd1f15078211a6d [formerly e9e9abd3db]
Former-commit-id: f14f792377
|
2014-07-07 13:33:35 -04:00 |
|
David Friedman
|
b2c35e26d6
|
ASM #15052 - WarnGen: service backup should use config.xml from failed site
Change-Id: Icff8ca2a124da595be6b83ac9f9999831daee0b1
Former-commit-id: b82fb691e0 [formerly 8784501bba] [formerly a45fe1dad0] [formerly b82fb691e0 [formerly 8784501bba] [formerly a45fe1dad0] [formerly db8977e281 [formerly a45fe1dad0 [formerly f9c0dc09ee7bc692c6f70b4a5ad67bb2c2ed5a20]]]]
Former-commit-id: db8977e281
Former-commit-id: 363de7a3c5 [formerly 5270711c5d] [formerly c850f84db3b8b601f2bbda41059ace7ce49e7f85 [formerly d36834080e]]
Former-commit-id: bb504fd33ed91e33e9927f5c6b5ff9592840208c [formerly 4f53bbd556]
Former-commit-id: c44e9f88f6
|
2014-07-03 13:58:24 +00:00 |
|
Juliya Dynina
|
df5f676026
|
Merge "ASM #253 Update RadarBiasTableDialog to remove old code." into asm_14.2.2
Former-commit-id: 3cb8068313 [formerly 67580e73cd] [formerly 244b2f5f3a] [formerly 3cb8068313 [formerly 67580e73cd] [formerly 244b2f5f3a] [formerly 470d50b4e4 [formerly 244b2f5f3a [formerly d6ae0d12f104de38b8fa770e4576b96a32da360c]]]]
Former-commit-id: 470d50b4e4
Former-commit-id: 813a43336b [formerly d705c8c8a4] [formerly 72e68682747424c39bbb0d820e2f6e0c0ed5664e [formerly b1cec7d40e]]
Former-commit-id: c0a266fcaa2641e6b866cd9366ac8230ded3faa6 [formerly 3f043077b3]
Former-commit-id: d3073a02a7
|
2014-07-02 14:17:11 -05:00 |
|
Steve Harris
|
f1fe74e810
|
Merge branch 'master_14.2.2' (14.2.2-17,18) into omaha_14.2.2
Former-commit-id: eaa91efeec [formerly 9b7f820b06] [formerly 136af3f7e2] [formerly eaa91efeec [formerly 9b7f820b06] [formerly 136af3f7e2] [formerly 0ef8a057f9 [formerly 136af3f7e2 [formerly c88d3136dbadab41df5fbf37b4b7c821dfcd07d9]]]]
Former-commit-id: 0ef8a057f9
Former-commit-id: e33ef8294c [formerly cb8192cfaf] [formerly 98fbbbbfbae1101e8159ae2009421c421b3054fd [formerly 9f61f60f65]]
Former-commit-id: 8bf30c96c0516a61b493f4f6a6ab8dec379de18a [formerly a12a736737]
Former-commit-id: a19a11998f
|
2014-07-02 13:38:08 -05:00 |
|
Brian.Dyke
|
38679cddcd
|
Merge branch 'm1413_m1422_merge' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.2.2 CM-MERGE:14.1.3-4 into 14.2.2
Former-commit-id: e68dd70904 [formerly 0fc76ff807] [formerly d56843d0e8] [formerly e68dd70904 [formerly 0fc76ff807] [formerly d56843d0e8] [formerly 658cf3dd56 [formerly d56843d0e8 [formerly 142e61e538fb094633933e5a2e1244441fc0106b]]]]
Former-commit-id: 658cf3dd56
Former-commit-id: c3ecdd0017 [formerly c75320efc4] [formerly 57abe48bbea6dab9b6ce8e5057dfbbf8a77d3e8d [formerly 380b1d75de]]
Former-commit-id: 76ce66e268b9af2f519b7f5ef69d4c1046699e5a [formerly a94ec2062f]
Former-commit-id: 71c5365af3
|
2014-07-02 13:18:10 -04:00 |
|
steve.naples
|
0f4f7230ef
|
ASM #253 Update RadarBiasTableDialog to remove old code.
Change-Id: I003f8dbf520e1e8025afe46266d1ee4849003a6f
Former-commit-id: e82b0ae895 [formerly 3d75da3db0] [formerly 66c3241bc4] [formerly e82b0ae895 [formerly 3d75da3db0] [formerly 66c3241bc4] [formerly 4e959af1b4 [formerly 66c3241bc4 [formerly b9f868e0ced53987accf675bfe2ce1a1f4f34da1]]]]
Former-commit-id: 4e959af1b4
Former-commit-id: dbd231a099 [formerly f1c92f1e35] [formerly 18ba10573377ee74433b2ab0bbbbc0f2efa06dea [formerly 3cfabd29bc]]
Former-commit-id: e33d6b9199b205144f76ed9c11a26bf937dec501 [formerly 93c8f822cc]
Former-commit-id: 9f52699bd2
|
2014-07-02 15:30:48 +00:00 |
|
Nate Jensen
|
21d3d905b1
|
Issue #3337 disable logback packaging data in cave
Former-commit-id: 2baedbf6b8 [formerly 56363ffc4a] [formerly c003d70168] [formerly 2baedbf6b8 [formerly 56363ffc4a] [formerly c003d70168] [formerly 939fde1575 [formerly c003d70168 [formerly db10ba5a37dbe219110f4f902bf9257f2f220b3d]]]]
Former-commit-id: 939fde1575
Former-commit-id: 25379a63f6 [formerly c421e2de75] [formerly 3c068152fc5db062515196cd9a0c4241b85b8f92 [formerly a2cfcd8716]]
Former-commit-id: f92a2a465f2193ba867848c40d1d3ca215e457ba [formerly 75ffabbcc2]
Former-commit-id: b54a9694ee
|
2014-07-02 09:24:15 -05:00 |
|
Steve Harris
|
908e6e908b
|
Merge branch 'master_14.1.3' into master_14.2.2
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/WclInfo.java
edexOsgi/com.raytheon.uf.edex.activetable/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java
Former-commit-id: 070e025fb4 [formerly 4882158177] [formerly 483a69c58d] [formerly 070e025fb4 [formerly 4882158177] [formerly 483a69c58d] [formerly fcecd75dfd [formerly 483a69c58d [formerly f947df2bf87c0df3e461be5c6dd72e13a0743f61]]]]
Former-commit-id: fcecd75dfd
Former-commit-id: 8d6e807936 [formerly c59b92895c] [formerly 0931821f4ace5f034c8b87a9d38c16b0b9763945 [formerly 29c2cc0c29]]
Former-commit-id: 03a3c04cf900c39d9298620704be5b5397111cbe [formerly 998c9a4084]
Former-commit-id: 984b7b1df4
|
2014-07-01 18:05:43 -05:00 |
|
Brian.Dyke
|
7561401e78
|
Merge branch 'asm_14.2.2' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.2.2
Former-commit-id: 505d2d7938 [formerly 7b205d97ca] [formerly 3ed9e07c44] [formerly 505d2d7938 [formerly 7b205d97ca] [formerly 3ed9e07c44] [formerly f8759e2317 [formerly 3ed9e07c44 [formerly 625eefb5f53e292d947233c1cd0aa031e61ca9ea]]]]
Former-commit-id: f8759e2317
Former-commit-id: dd097258cf [formerly d5352e6909] [formerly 6cf6f19033a93ea38724edb412b097979a9d2b82 [formerly f58b4d01a4]]
Former-commit-id: 96d867c32f9a80781d3e59df463ba683a3cec89e [formerly 7d03e29db6]
Former-commit-id: d58b49a14a
|
2014-07-01 15:41:10 -04:00 |
|
Ron Anderson
|
26df246878
|
Omaha #3296 A few more minor performance tweaks and some addtional logging.
Change-Id: Iab603f6f7420a11c5c5cae82df7ebb96f66b0945
(cherry picked from commit 9e6a14877578177e4cfb0c5698097750bde6f280)
Former-commit-id: 319819d3a7 [formerly c7a74ab5b1] [formerly 2c5f910f90] [formerly 319819d3a7 [formerly c7a74ab5b1] [formerly 2c5f910f90] [formerly 4123073c4e [formerly 2c5f910f90 [formerly a0384ccfb30a877f14893c6cfa62d92117c0bb87]]]]
Former-commit-id: 4123073c4e
Former-commit-id: 9210f3a55d [formerly 0329b4d8f4] [formerly 0e147fb71ca969d1fc46cffd1962c97ca7cece30 [formerly 892eb70952]]
Former-commit-id: 05ef0d1dfd0a62197a13dc4c5614043584e047f3 [formerly bb91362572]
Former-commit-id: ac6b3b0b10
|
2014-07-01 13:56:41 -04:00 |
|
Ron Anderson
|
d6ffc28779
|
Omaha #3296 Added performance logging. Moved backup and purging to separate java thread. Cached PythonScript.
Change-Id: I9814345b512674269f17f4bf61bd615f0a50b059
(cherry picked from commit a11bcadd76eb9f9597e23ee609fd9cb364ad26ac)
Former-commit-id: 1f056e7ab9 [formerly 9818d9b485] [formerly beee08c32b] [formerly 1f056e7ab9 [formerly 9818d9b485] [formerly beee08c32b] [formerly 487c7ee30a [formerly beee08c32b [formerly 49638ba1e9561dea7b318b7adc0f1ab9571170f5]]]]
Former-commit-id: 487c7ee30a
Former-commit-id: 53c11e062a [formerly 699f2aa9bf] [formerly b61496c3397723d5bba2b477c82852166c411ddf [formerly c16fc8ee7f]]
Former-commit-id: 115b6d514da08606bd90d2de458c294ecc3e8d7e [formerly 8314f40ec3]
Former-commit-id: 2b33bfac7d
|
2014-07-01 13:56:05 -04:00 |
|
Juliya Dynina
|
01f10d8e38
|
Merge "ASM #663 - WarnGen does not properly handle Outer Banks Counties in North Carolina" into asm_14.2.2
Former-commit-id: 9fc999e435 [formerly bf765525b7] [formerly b5e4bc1fdc] [formerly 9fc999e435 [formerly bf765525b7] [formerly b5e4bc1fdc] [formerly 102da2d0f7 [formerly b5e4bc1fdc [formerly 714dbccbd26a1b6fafa486b2ddbce98d7f38c8eb]]]]
Former-commit-id: 102da2d0f7
Former-commit-id: 174d866359 [formerly b4d23902a7] [formerly 2d2b83dfaec86884c0ce72c54cf9440fd6074009 [formerly 7ed2a8cbd4]]
Former-commit-id: 4eefb3ff8da1d8b45bbb5382f3de7f17a72b1b23 [formerly 8f3581340b]
Former-commit-id: 5a9181fcc1
|
2014-07-01 10:05:57 -05:00 |
|
Juliya Dynina
|
b000b1f3ac
|
Merge "ASM #660 - WarnGen can generate polygons that do not match hatched area" into asm_14.2.2
Former-commit-id: 0959178a06 [formerly 3ee22b685d] [formerly 0fe04515ad] [formerly 0959178a06 [formerly 3ee22b685d] [formerly 0fe04515ad] [formerly 3aeceabb7a [formerly 0fe04515ad [formerly 2260a05df61ec1dc21cc6619fcb48713368e3a46]]]]
Former-commit-id: 3aeceabb7a
Former-commit-id: c9d3f1b5d1 [formerly 5c26ceab68] [formerly b03f0ad90da3bfbb7d2a3233ecd2e7b958495f95 [formerly 39cfec2067]]
Former-commit-id: 2df3731cf0d242cde36a4e9b618c77f44e3aa644 [formerly 5d11d65233]
Former-commit-id: 5bfd88dd2f
|
2014-07-01 09:01:55 -05:00 |
|
Sean.Webb
|
1b7f4a8121
|
ASM #552 - Increased postgres max_connections to 400
Change-Id: I6e4a3c02ff2645480ca20274f1fa445e25196a03
Former-commit-id: 4aa35df7c7 [formerly 5288764393] [formerly c24c2f1e3e] [formerly 4aa35df7c7 [formerly 5288764393] [formerly c24c2f1e3e] [formerly 0b29e66772 [formerly c24c2f1e3e [formerly add5d004eca457782f957a95262e880b91dfeeb1]]]]
Former-commit-id: 0b29e66772
Former-commit-id: 010d6b9516 [formerly cd179cddff] [formerly fb4ad3bfb75666fa94af0badd60456d9cfcc4290 [formerly a875ae3f24]]
Former-commit-id: bc0c747f1f72f5b7593a653e0a4748bab19eab8d [formerly c9d3906b32]
Former-commit-id: 342896c0d7
|
2014-06-30 16:06:25 -04:00 |
|
Qinglu.Lin
|
a4d359fce0
|
ASM #663 - WarnGen does not properly handle Outer Banks Counties in North Carolina
Change-Id: If7fbcea362618e0dea5153f65489388b406b7a81
Former-commit-id: 660d1c9ff2 [formerly 1180b31875] [formerly 1200633cd2] [formerly 660d1c9ff2 [formerly 1180b31875] [formerly 1200633cd2] [formerly 1d52d020eb [formerly 1200633cd2 [formerly 4d50beaed59d785d923e357f8ce036f6625ce4b4]]]]
Former-commit-id: 1d52d020eb
Former-commit-id: 712f3b0f46 [formerly 5e07f13dd8] [formerly 79c9a926a4430a2e87a6959f559d52c89cb1c374 [formerly 6e4b7e1e6d]]
Former-commit-id: d7eb9af4998b1fcd67d349f3068f4af192e86aff [formerly 3eaedad105]
Former-commit-id: 7235488050
|
2014-06-30 13:09:15 -04:00 |
|
David Friedman
|
f2728065ba
|
ASM #660 - WarnGen can generate polygons that do not match hatched area
Change-Id: I48e93e69d75e903b266f5bb615dd8a72e8813652
Former-commit-id: 5c62d368ea [formerly c4967a96fb] [formerly 18b3b61afc] [formerly 5c62d368ea [formerly c4967a96fb] [formerly 18b3b61afc] [formerly dc25040a25 [formerly 18b3b61afc [formerly 993663cbee3f794981fc7f4cc97f96e3b86c47f8]]]]
Former-commit-id: dc25040a25
Former-commit-id: 2e4cf863dd [formerly 217aa6ce76] [formerly 7b3bdb180812815c4f2d1bc65959d40cce07d595 [formerly b546ca6ac8]]
Former-commit-id: d5d8e4678be9cbb6c94920e0cb97562c13b4888f [formerly a756c1436b]
Former-commit-id: 18b1d17550
|
2014-06-27 19:17:55 +00:00 |
|
Mike Duff
|
b88d5fc6e7
|
Issue #3321 - Fix ingest switch checks
Change-Id: I7de7ee482ab57789874a179499e6c51079e68e12
Former-commit-id: 0de6d3b92a [formerly 1d3aeb881b] [formerly f17c93bb19] [formerly 0de6d3b92a [formerly 1d3aeb881b] [formerly f17c93bb19] [formerly d62c925baa [formerly f17c93bb19 [formerly 5df0ac7f96d1280c1c50f39982693f9503b56f14]]]]
Former-commit-id: d62c925baa
Former-commit-id: 9c869c928e [formerly 5078011147] [formerly 939d0365bdd8eecc342c0665f97c4d8d8697f445 [formerly d2cbeff06a]]
Former-commit-id: cc2d0bb3117f698401c903f5221926bbed77ac62 [formerly 07dda3ecc1]
Former-commit-id: 6163364939
|
2014-06-26 16:23:02 -05:00 |
|
Brian.Dyke
|
3295154a2b
|
Merge branch 'master_14.2.2' into asm_14.2.2
Former-commit-id: 5b88408af1 [formerly a48268a1d6] [formerly a5ae302690] [formerly 5b88408af1 [formerly a48268a1d6] [formerly a5ae302690] [formerly 3df14b5a94 [formerly a5ae302690 [formerly 632577244e843dd122c00b745e973730c7920246]]]]
Former-commit-id: 3df14b5a94
Former-commit-id: 6da2ede9a5 [formerly 88411f7f52] [formerly 83724e09627d39b69b326bff065865d4439a3263 [formerly 97619031c9]]
Former-commit-id: e982c4d9565c1143f60c3bb8c3d493b9960113bd [formerly 9197f47f29]
Former-commit-id: a1d171c6c3
|
2014-06-26 10:39:49 -04:00 |
|
Ron Anderson
|
9e022261ae
|
Issue #3317 Fix merge problem that removed GFE notification of D2D purge
Change-Id: I925b7287bdb2fb7f9c330b05b1b2c32031e693d9
Former-commit-id: 8c0311507b [formerly 5dd7a035ac] [formerly ead09dd683] [formerly 8c0311507b [formerly 5dd7a035ac] [formerly ead09dd683] [formerly a6956a8ccd [formerly ead09dd683 [formerly 04805a8957ef14754225f85f4722d8302cde8df3]]]]
Former-commit-id: a6956a8ccd
Former-commit-id: 81db7329c7 [formerly 8b027efdec] [formerly 95a171c25d2d56a721f156a97720989d676e8e63 [formerly 7abeff57cc]]
Former-commit-id: efa4e25bb2ebffaf63718fb148cb9143abea2252 [formerly e5b81ccee0]
Former-commit-id: b4a2ae3aae
|
2014-06-25 19:12:51 +00:00 |
|
Ron Anderson
|
f48167eb8d
|
Issue #3317 Fix issue with obsolete D2DGridDatabases not getting purged.
Change-Id: If792327215bb9f8db470c95099463e735c462d46
Former-commit-id: cdef6bd26c [formerly f76a2d3700] [formerly 898b30fadb] [formerly cdef6bd26c [formerly f76a2d3700] [formerly 898b30fadb] [formerly 2ac9cd84ec [formerly 898b30fadb [formerly 2a84ea1af7bb767e9e85387de1fd90c662f9f91d]]]]
Former-commit-id: 2ac9cd84ec
Former-commit-id: 0076ccb311 [formerly ddcfe574d8] [formerly 63b195143dbea5ac0724f5f746efdcdd457eeade [formerly ff5c0f2c33]]
Former-commit-id: 35d631e2502a21703771a49f440d628b03dfec10 [formerly 2cc92ecc69]
Former-commit-id: 849625a3e1
|
2014-06-25 13:21:32 -05:00 |
|
Steve Harris
|
6285d3dac6
|
Merge branch 'master_14.2.2' (master_14.2.2-15) into omaha_14.2.2
Former-commit-id: 7f040f069c [formerly 3f2058a1ab] [formerly 89606076ec] [formerly 7f040f069c [formerly 3f2058a1ab] [formerly 89606076ec] [formerly ddc6f2092a [formerly 89606076ec [formerly 174fe6d66525229f328846a1f4564300d7603c10]]]]
Former-commit-id: ddc6f2092a
Former-commit-id: dd6d6c031d [formerly 304d918a7c] [formerly 018aec814b6ca7a979cdc1b5c53150d6797d0df5 [formerly 1f033d22e6]]
Former-commit-id: 7b12be7aa1ce8ea1ba2ec797cf62aa5d09c44514 [formerly 323c240f59]
Former-commit-id: 2841134c60
|
2014-06-24 10:57:56 -05:00 |
|
steve.naples
|
d7ff8a2638
|
ASM #253 Update RadarBiasTableDialog to allow undo changes.
Change-Id: Ibfb87730fda8185b27777fd83606bc1397aca1f9
Former-commit-id: e994aa9482 [formerly 2a49bbda2f] [formerly efe877d82b] [formerly e994aa9482 [formerly 2a49bbda2f] [formerly efe877d82b] [formerly 90ed511478 [formerly efe877d82b [formerly fcd20d35abf3617701cc797baf9ba2b3984379c8]]]]
Former-commit-id: 90ed511478
Former-commit-id: b8d5f833ec [formerly 2e77b74c44] [formerly f502e650f306b12ad50f762f688616a9b1039de1 [formerly 362e1ce880]]
Former-commit-id: d75382cb3e72ed1c52902aa0d9f71c8e7e9c77f6 [formerly 5dcda5cabc]
Former-commit-id: 3638879057
|
2014-06-24 15:52:23 +00:00 |
|
Nate Jensen
|
764d34448d
|
Issue #3248 ensure that a locking file output streams obtains the lock
before calling the FileOutputStream constructor
Change-Id: I210ac789322c975cb93584facb3eec417f5097f2
(cherry picked from commit e8d704968a2a87105489ad9cb51cd8aea78401aa [formerly 65eb76ff66] [formerly e39ecf5473 [formerly 4558fe5862] [formerly 845483346f] [formerly e39ecf5473 [formerly 4558fe5862] [formerly 845483346f] [formerly 65eb76ff66 [formerly 845483346f [formerly 599f2598f711ce2ae6ac69ed78a90502a84d2716]]]]])
Former-commit-id: ef9e4c2439 [formerly 333f8317bb] [formerly ca27873204] [formerly ef9e4c2439 [formerly 333f8317bb] [formerly ca27873204] [formerly 65619399a0 [formerly ca27873204 [formerly f0ad63d2ccf347e92274701f9890e120b9e70140]]]]
Former-commit-id: 65619399a0
Former-commit-id: 8bd6177ae8 [formerly 3add021413] [formerly 848ea22f8aa30435c636b4df2b4d2bebcb508ed9 [formerly f9fce25836]]
Former-commit-id: 2afe008a92baa2a5e2c3477d56f0dceac797e9ae [formerly e717dbfeb1]
Former-commit-id: e62629413d
|
2014-06-23 11:59:26 -05:00 |
|
Nate Jensen
|
18e78f42d9
|
Issue #3307 fix xml serialization of looping field
Former-commit-id: cfd3efcfe2 [formerly c7c0d9cb4b] [formerly 51da67dd3f] [formerly cfd3efcfe2 [formerly c7c0d9cb4b] [formerly 51da67dd3f] [formerly 97ef9fc343 [formerly 51da67dd3f [formerly c6ce72840a4ee0f44eacff46015b5382d86dd47f]]]]
Former-commit-id: 97ef9fc343
Former-commit-id: 1d50803d20 [formerly 416e6fc85d] [formerly 2bea2ce9efcdf786438dba2900ce1aaaf1cf5e3b [formerly a3c20eb98a]]
Former-commit-id: 49f94b32b485b3b8042a4e7e0f9a84d3a790f3e7 [formerly 9a3a4d5bfd]
Former-commit-id: b1ab93a361
|
2014-06-23 09:54:11 -05:00 |
|
Steve Harris
|
7e7529e482
|
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: 869235c02a [formerly 16f5ff0979] [formerly b84dda5930] [formerly 869235c02a [formerly 16f5ff0979] [formerly b84dda5930] [formerly 419c5f4aba [formerly b84dda5930 [formerly ce5767f2bbf5c9627bd43e766c6193c261c48af3]]]]
Former-commit-id: 419c5f4aba
Former-commit-id: bab435f286 [formerly af06c5a890] [formerly dd639a780b77ef5a2f827ee961c20e9db23d2d31 [formerly 66d30e59a3]]
Former-commit-id: 27bd7f3ff5ce8e46cd91569a3f0cf62fa9127e53 [formerly 935542914d]
Former-commit-id: 196f53e609
|
2014-06-20 14:01:55 -04:00 |
|
Brian.Dyke
|
71ca3ae180
|
CM-MERGE:OB13.5.6-4 into 14.1.3
Former-commit-id: e3dc97e246 [formerly be589ceb9b] [formerly 399c06820a] [formerly e3dc97e246 [formerly be589ceb9b] [formerly 399c06820a] [formerly 8ecdd9a192 [formerly 399c06820a [formerly 86dc406cd227362abc5274f4cd64813ceb91d00d]]]]
Former-commit-id: 8ecdd9a192
Former-commit-id: f09000ec64 [formerly e28febcf27] [formerly 9723a25d830a41cf2e060dc218ad841643217c3e [formerly 9031f58d02]]
Former-commit-id: c6144f8a9f4e5c44b2c2c7442f0100f646622fba [formerly 3e10995d87]
Former-commit-id: b602d29456
|
2014-06-18 08:55:49 -04:00 |
|
Brian.Dyke
|
8a771cc705
|
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: 232d538288 [formerly 06c565d74f] [formerly 30d8644fa5] [formerly 232d538288 [formerly 06c565d74f] [formerly 30d8644fa5] [formerly 482f915b42 [formerly 30d8644fa5 [formerly 4b317062ce5c35823210cbbf023c0f0fc8051ef3]]]]
Former-commit-id: 482f915b42
Former-commit-id: aa70f67645 [formerly c1bd7a0c55] [formerly aa11101c8c0f5e91cdf9e5a2ddbd70bdcc0dd9a3 [formerly 072a4a9d63]]
Former-commit-id: 220ffe796aa220960bdf60c9b20ae4086c78d256 [formerly ce9ebc90f5]
Former-commit-id: 03f8202ff2
|
2014-06-13 14:05:49 -04:00 |
|
Brian.Dyke
|
54db4c05b5
|
CM-MERGE:OB13.5.6-3 into 14.1.3
Former-commit-id: 4766b3f49f [formerly 5064d24e26] [formerly 346bf852cd] [formerly 4766b3f49f [formerly 5064d24e26] [formerly 346bf852cd] [formerly 81832d97e5 [formerly 346bf852cd [formerly df99fcb0a4be27d5f2d22935847fb55b8bfbbb58]]]]
Former-commit-id: 81832d97e5
Former-commit-id: ba9fb22f58 [formerly 764b729546] [formerly 4b8123012f6cebd56dd11d52a9381b3f0d930dd0 [formerly 4bca0769fb]]
Former-commit-id: 6a3a4bbef432d2ba4ec423342a3283d6354a3f92 [formerly 766974a05d]
Former-commit-id: 3da13f3d12
|
2014-06-13 13:21:19 -04:00 |
|
Steve Harris
|
2f5548b43d
|
Merge branch 'master_14.2.2' (14.2.2-13) into omaha_14.2.2
Conflicts:
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
Change-Id: If5dae78936eddf1bc4ee63f35beb96a0cb9defb9
Former-commit-id: 61cb3f45b4 [formerly 3a3277c469] [formerly ad6e9fa5ee] [formerly 61cb3f45b4 [formerly 3a3277c469] [formerly ad6e9fa5ee] [formerly 9510608b74 [formerly ad6e9fa5ee [formerly cf56d49dc5a197fa114fa6c468860d63621a9cdc]]]]
Former-commit-id: 9510608b74
Former-commit-id: a18a176b4f [formerly f78bc57920] [formerly 3c82f5e3d74beb4ba9dff59b89b9c241d9fea0d9 [formerly 23dea36a2c]]
Former-commit-id: fd8723b0332dc846ef24dcb7bd7b484cb4592bd5 [formerly 5a86a00518]
Former-commit-id: 435da06069
|
2014-06-11 12:55:44 -05:00 |
|
David Friedman
|
b373fea52f
|
ASM #604 - Lightning display varies depending how long CAVE has been open
Change-Id: Id85b87e21833ef00e80693b8526d976ccb4bb63e
Former-commit-id: 350566a514 [formerly 6d0d3f5ba5] [formerly b8542c1332] [formerly 350566a514 [formerly 6d0d3f5ba5] [formerly b8542c1332] [formerly 1c84c31e30 [formerly b8542c1332 [formerly a3f4fd6537f3847011e199e0f043968d9f595937]]]]
Former-commit-id: 1c84c31e30
Former-commit-id: 5d2dcfe9c8 [formerly 0ba91c6c28] [formerly 2134244bb7c5f6877ba479473585ac3ff2a3cceb [formerly 8c8f54994b]]
Former-commit-id: 84d4ad89f719f3725ff0576bdad2b7cdfef1cdd6 [formerly d50646b479]
Former-commit-id: 3b686ca052
|
2014-06-11 13:37:16 +00:00 |
|
Brian.Dyke
|
f5befd7116
|
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: 7056d79f70 [formerly 0f07e14bf1] [formerly f72380ad60] [formerly 7056d79f70 [formerly 0f07e14bf1] [formerly f72380ad60] [formerly 9ab17ddecb [formerly f72380ad60 [formerly 797aa6bfbf2802aa7355b7a4a77d0fb4f54dfd6a]]]]
Former-commit-id: 9ab17ddecb
Former-commit-id: 5893782ec3 [formerly 816dcf74e4] [formerly d838e1972c1a8529e2efc996d44a235ce685e8db [formerly 49cd9574d9]]
Former-commit-id: b46938d836881d648f671f55d48408d36e6cb22f [formerly a4b39dfca5]
Former-commit-id: 1ae1410e46
|
2014-06-10 13:56:03 -04:00 |
|
Brian.Dyke
|
7caa757318
|
CM-MERGE:OB13.5.6-1,-2 into 14.1.3
Former-commit-id: 64a10ce12d [formerly ef5c74dece] [formerly c1b3f9d180] [formerly 64a10ce12d [formerly ef5c74dece] [formerly c1b3f9d180] [formerly 8874d41872 [formerly c1b3f9d180 [formerly b859032bcec187616adfd414dd1ce5fe27829e9e]]]]
Former-commit-id: 8874d41872
Former-commit-id: d6ebcad87e [formerly 4f0fc67b1f] [formerly c763da54d370b72fa17bd0154f839ff80cd9226a [formerly f568b5606a]]
Former-commit-id: cb4c4f5cdbcafd5e7f18339757c3484f03c17e30 [formerly 81d732477e]
Former-commit-id: a39afc1dfa
|
2014-06-10 12:52:59 -04:00 |
|
Steve Harris
|
460828069f
|
Merge branch 'master_14.2.2' (14.2.2-12) into omaha_14.2.2
Former-commit-id: 483d61f414 [formerly 6e09bce335] [formerly 14370245fd] [formerly 483d61f414 [formerly 6e09bce335] [formerly 14370245fd] [formerly bd98f04cde [formerly 14370245fd [formerly 65793ec4d12626b2d3365c5a0e8c3e229972b289]]]]
Former-commit-id: bd98f04cde
Former-commit-id: 69d90af81f [formerly 2445542f10] [formerly 053a4d7ccdcd52fb49e7e7bdd39b7346b3706960 [formerly c11a44259e]]
Former-commit-id: e341f6ab52dbb4bf615dc2cbe67c9dddfb50c0c3 [formerly 2569e13053]
Former-commit-id: 67b4501d9b
|
2014-06-09 15:20:03 -05:00 |
|
Mike Duff
|
f1dd41a042
|
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: b2162559fe [formerly b876d9755a] [formerly 81ab64d7ff] [formerly b2162559fe [formerly b876d9755a] [formerly 81ab64d7ff] [formerly 39173c380c [formerly 81ab64d7ff [formerly 7fe0dae041cb68aba968e22d5895cce22a210ee6]]]]
Former-commit-id: 39173c380c
Former-commit-id: 7316895b98 [formerly 60fe02137f] [formerly 218dced89f74bad34c2dfce78c1142304822bd73 [formerly b880d171d4]]
Former-commit-id: f76ab4fcf17730eb720be95ca87a67c136734004 [formerly 4b9f707a06]
Former-commit-id: bb122607cc
|
2014-06-06 16:03:14 -04:00 |
|
Xuezhi.Wei
|
8550a855da
|
ASM #579 - shef-ingest.xml updates for performance tracking
Change-Id: If3b24f8385e955d003d79e22605d4536321c73b2
Former-commit-id: ba05b6f16a [formerly 81ec03e291] [formerly bdbeec662c] [formerly ba05b6f16a [formerly 81ec03e291] [formerly bdbeec662c] [formerly 33b235a0a4 [formerly bdbeec662c [formerly f7b5f3bbc71cc251e19f1764ee7756050895b7a3]]]]
Former-commit-id: 33b235a0a4
Former-commit-id: 869427a96a [formerly e2f7548351] [formerly 4364d6d4c712093350ad1d6bb73a1c9077cfb53c [formerly 445d58699a]]
Former-commit-id: 52a1669a642727f3a804c657a32769c37b04af1c [formerly ae0a348358]
Former-commit-id: 6911a1f357
|
2014-06-06 17:40:09 +00:00 |
|
Juliya Dynina
|
c165d815fa
|
Merge "ASM #114 - Problem with Distance Speed Tool." into asm_14.2.2
Former-commit-id: 1b61a32634 [formerly 21cd415434] [formerly 80a83bd44c] [formerly 1b61a32634 [formerly 21cd415434] [formerly 80a83bd44c] [formerly 87216a87de [formerly 80a83bd44c [formerly 1e1c7cbcee94e782338d440d585a3217ad606725]]]]
Former-commit-id: 87216a87de
Former-commit-id: d807e4c657 [formerly 8d89e35985] [formerly 01c388eee593213b036d8a0380d954c53ca38d29 [formerly b6a4959e21]]
Former-commit-id: 38821b70bd70a3e19e76dace2f65ab0d4cb9690b [formerly 93c2e97e2e]
Former-commit-id: c5d4d8308e
|
2014-06-06 09:50:36 -05:00 |
|
Sean Webb
|
a421f14d07
|
Merge "ASM #611 fix to MHS issues in DR_17297" into asm_14.2.2
Former-commit-id: 52283357c8 [formerly e0f9eabb45] [formerly 016648ffaf] [formerly 52283357c8 [formerly e0f9eabb45] [formerly 016648ffaf] [formerly cb43d21243 [formerly 016648ffaf [formerly 5556e19903965bea22ca2f11b51fcc1c95cb07f8]]]]
Former-commit-id: cb43d21243
Former-commit-id: b196247c36 [formerly b35f945bec] [formerly 4706f754c942852a68f343f015e6e1efe8ea3f83 [formerly c52983ab68]]
Former-commit-id: d9784dae569d3e3b65f6850c52ce7fab092a38df [formerly 4e6fa39e5e]
Former-commit-id: 45d5701876
|
2014-06-05 15:03:11 -05:00 |
|
Fay.Liang
|
143da74890
|
ASM #611 fix to MHS issues in DR_17297
Change-Id: Ie32edc0bac5458e3d356a0b6b3deea0f8d520cb7
Former-commit-id: 46926b679d [formerly fa2cdbfac1] [formerly d1aa160aa7] [formerly 46926b679d [formerly fa2cdbfac1] [formerly d1aa160aa7] [formerly c5e6daa943 [formerly d1aa160aa7 [formerly fc06896ae4d9adf0973522313f5e65df6ac67fa4]]]]
Former-commit-id: c5e6daa943
Former-commit-id: 4c11888976 [formerly 40eeef7fd1] [formerly 03458502710ffda685e54402a1e36d9e18ebbf95 [formerly 39efc11cb3]]
Former-commit-id: 1894dd6372d16ff3ad9763a5fc2c17a4e819ca79 [formerly ce1e19955e]
Former-commit-id: 1ddb7a2b0b
|
2014-06-05 15:49:27 -04:00 |
|
Mike Duff
|
e54d8dd946
|
Issue #3222 - Fix for SHEF posting times
Former-commit-id: 3a3928cde3 [formerly 28a42f3f10] [formerly 8a5acd085d] [formerly 3a3928cde3 [formerly 28a42f3f10] [formerly 8a5acd085d] [formerly f5f101d416 [formerly 8a5acd085d [formerly 3f1f9cf4fa6207edae642db5cffdc8284091f31a]]]]
Former-commit-id: f5f101d416
Former-commit-id: e89e9975c5 [formerly 8e6a50e2ee] [formerly 63be3054ca051657de6e1a1480a28374ac8bc854 [formerly 87d41ff302]]
Former-commit-id: 298e4a841acd8adf70326608c890a015d030d238 [formerly a615c41a57]
Former-commit-id: c2751cf532
|
2014-06-05 09:35:07 -05:00 |
|
Michael Gamazaychikov
|
b3afeb981b
|
ASM #114 - Problem with Distance Speed Tool.
Change-Id: I2b3218b2fb407f99cf9c81edf69feb042a6fee75
Former-commit-id: efd0fb50b8 [formerly e5a9fa0827] [formerly c07bcacbf8] [formerly efd0fb50b8 [formerly e5a9fa0827] [formerly c07bcacbf8] [formerly 50ab77046b [formerly c07bcacbf8 [formerly a38308fa5a6efe9a07ecd84bd93662bea32afc94]]]]
Former-commit-id: 50ab77046b
Former-commit-id: fc5acb6bcb [formerly a2423cfadc] [formerly a99f478987db9b40c18652f3f209154a8dfc3177 [formerly 5efb82ea3e]]
Former-commit-id: 177375df5384d0a8fa51c23b24915e671ade7ce1 [formerly 29e197404f]
Former-commit-id: 94595e6af4
|
2014-06-05 13:43:04 +01:00 |
|
Zhidong.Hao
|
e842be1d53
|
ASM #106 - AvnFPS Monitor TAF valid time display different from A1
Change-Id: Iddf3f4ee46b94f28494dc15764b91f38c0176325
Former-commit-id: 43e1a5a909 [formerly ccbda4db4f] [formerly 26c6801620] [formerly 43e1a5a909 [formerly ccbda4db4f] [formerly 26c6801620] [formerly 71ab6b9ed0 [formerly 26c6801620 [formerly 74597b2630ffd8d984b193f72126a9a5d0b3a942]]]]
Former-commit-id: 71ab6b9ed0
Former-commit-id: 460b543c6d [formerly 9094e822e0] [formerly c17aa2176430d3a612529390ab4b68f86ac03181 [formerly e5c47a51eb]]
Former-commit-id: 16d700e0af2365b3ff5388b53260c131a361d620 [formerly 3a9abec04b]
Former-commit-id: 33086a8085
|
2014-06-03 11:55:32 -04:00 |
|
brian.dyke
|
37b3baed83
|
Merge branch 'master_14.2.2' into asm_14.2.2
Former-commit-id: e1f9c919e6 [formerly 2f53c2e385] [formerly 7dde6e1d04] [formerly e1f9c919e6 [formerly 2f53c2e385] [formerly 7dde6e1d04] [formerly ee7c67f7b0 [formerly 7dde6e1d04 [formerly d7b707236a1ee3bca45dee26c10814d9e3c275c8]]]]
Former-commit-id: ee7c67f7b0
Former-commit-id: b2b232c2cc [formerly 8b93c973d6] [formerly 5b345e8fad1dba7b952e789980e9a6f6873f05eb [formerly cf49a7217f]]
Former-commit-id: 1c3c352f258fa1fe750be56c373b425249190beb [formerly 05f691d0cd]
Former-commit-id: a5b2f384bf
|
2014-05-30 10:07:12 -04:00 |
|
Matthew Howard
|
904a3b24f7
|
Merge "ASM #209 - Fix Svcbu cleanup script" into asm_14.2.2
Former-commit-id: d0880003a6 [formerly 099185c960] [formerly 781d0331ab] [formerly d0880003a6 [formerly 099185c960] [formerly 781d0331ab] [formerly 8375a2af3e [formerly 781d0331ab [formerly def2351f527613dd62a081161e5f3a87756493ec]]]]
Former-commit-id: 8375a2af3e
Former-commit-id: b7f3c5798e [formerly 11216ced25] [formerly d46f8a355df86411c1f5283003df72a741dbec12 [formerly f68748bd63]]
Former-commit-id: 46ac2ea21d50d92b8371c417dd9b8efffd8f82a9 [formerly 04c0631701]
Former-commit-id: db35baefc8
|
2014-05-29 15:54:37 -05:00 |
|