steve.naples
|
4322781b77
|
ASM #253 Update RadarBiasTableDialog fix issue of not saving undo.
Change-Id: I57ad9d4407665fd4c5f7e922cbf3daac373c9f88
Former-commit-id: 558e2824ca [formerly 72ae26401d] [formerly 2ebfd61f12] [formerly 2ebfd61f12 [formerly 339fcbc18a]] [formerly 558e2824ca [formerly 72ae26401d] [formerly 2ebfd61f12] [formerly 2ebfd61f12 [formerly 339fcbc18a]] [formerly 0bd7b6c65b [formerly 2ebfd61f12 [formerly 339fcbc18a] [formerly 0bd7b6c65b [formerly 24b9a6e0801cc653062a71d86090df3836aa86a4]]]]]
Former-commit-id: 0bd7b6c65b
Former-commit-id: c99fe19527 [formerly 04208dc837] [formerly 6b58fb2509] [formerly 75947f706d09e9e6830c7eacc11a361905fde0fc [formerly 05c10c3b18e9704c50ddf97525d0165e3c4e0b2b] [formerly 6b58fb2509 [formerly aa8c11d134]]]
Former-commit-id: 775739ca81556dc20ea10c7dc06848f1c3c5bcc3 [formerly f17ec83e9cf28c564f411b5e04c09e7a9226b11f] [formerly db04c1a2ec [formerly 458dd1fe8f]]
Former-commit-id: db04c1a2ec
Former-commit-id: afe17e2857
|
2014-07-09 15:42:51 +00:00 |
|
Ron Anderson
|
1b1f99a717
|
Issue #3332 Fixed race condition which could cause GFE grid saving to hang
Change-Id: I4a2ef9e25999d95ac1ecf204907c59b2f1e85652
Former-commit-id: 083a933abc [formerly 10f629428e] [formerly 4b4629a2fd] [formerly 4b4629a2fd [formerly 111b04296c]] [formerly 083a933abc [formerly 10f629428e] [formerly 4b4629a2fd] [formerly 4b4629a2fd [formerly 111b04296c]] [formerly 5efba03474 [formerly 4b4629a2fd [formerly 111b04296c] [formerly 5efba03474 [formerly b01b72b896b894568acce6a8dc4d45328a06067a]]]]]
Former-commit-id: 5efba03474
Former-commit-id: 8b91e674a9 [formerly 9691bf2dee] [formerly e39615ab7a] [formerly 1e14dd96de8e306562bc12717eaaddb8800ab479 [formerly 629e83f9edf01bd52b896613ba791f05dcdcec19] [formerly e39615ab7a [formerly 1cc0ff4ab7]]]
Former-commit-id: f58242f9a4204250c6473bf926b78d1f2a16c208 [formerly 8d831abf9d91162a2834bb4a5f34984776cfb287] [formerly a1a980ed6e [formerly 0a7c4c855e]]
Former-commit-id: b78a090862c529d2c2a9d7e32d027defb76d9cbc [formerly a1a980ed6e]
Former-commit-id: 57b2705ef7
|
2014-07-09 08:56:06 -05:00 |
|
steve.naples
|
ad5d7fc51f
|
ASM #253 Update RadarBiasTableDialog fix issue of not saving.
Change-Id: If88c12673afeb3ae8cecfb53d856bc90820a4673
Former-commit-id: 3b0d4be84f [formerly 9dcf27e217] [formerly 29ca2338b8] [formerly 29ca2338b8 [formerly 75969ceec2]] [formerly 3b0d4be84f [formerly 9dcf27e217] [formerly 29ca2338b8] [formerly 29ca2338b8 [formerly 75969ceec2]] [formerly 24b0d49a5b [formerly 29ca2338b8 [formerly 75969ceec2] [formerly 24b0d49a5b [formerly 9021eca6b32dd2b3859cd928c14a0e40a4907c13]]]]]
Former-commit-id: 24b0d49a5b
Former-commit-id: a97faef004 [formerly bd3e8973d2] [formerly 94e246b619] [formerly 5ac10537c98678ec97f3a327bd578403c9f9e2c7 [formerly 8b99713670e5a0d85aee792b8067ae607b78230c] [formerly 94e246b619 [formerly ea071e81f5]]]
Former-commit-id: ef42ff64fa30bd4afa6052529046189a9457bc21 [formerly 92c9bb35d883903b31bca5165db414369b88663d] [formerly 10e2eaa6ed [formerly 23ff3f3fe7]]
Former-commit-id: c62d24fe40d865dd0bf982c20f1f0839367106b5 [formerly 10e2eaa6ed]
Former-commit-id: 0bf2f3eed5
|
2014-07-08 16:32:08 +00:00 |
|
Brian.Dyke
|
f61ca59c68
|
Merge branch 'asm_14.2.2' of winter:/data/gerrit2/git/AWIPS2_baseline into master_14.2.2
Former-commit-id: d29420685e [formerly 6ea9a4cc23] [formerly a33fdeb558] [formerly a33fdeb558 [formerly 2ef4767652]] [formerly d29420685e [formerly 6ea9a4cc23] [formerly a33fdeb558] [formerly a33fdeb558 [formerly 2ef4767652]] [formerly 89c0457b1d [formerly a33fdeb558 [formerly 2ef4767652] [formerly 89c0457b1d [formerly 845aebda9d8af143e3a6828c066b291e0343a020]]]]]
Former-commit-id: 89c0457b1d
Former-commit-id: e746b95543 [formerly 05693a6e32] [formerly 6be18f0dd4] [formerly bfdbb7dbe18217c0edac0a4b70c4a245bf182088 [formerly db3d46678c921e727f9c882b090df6f420aabdba] [formerly 6be18f0dd4 [formerly a2dc10847c]]]
Former-commit-id: e96955f0e960759ff1971417aaad6a2463a3d951 [formerly ad91e4d3778911324da29cefafd1f15078211a6d] [formerly f14f792377 [formerly e9e9abd3db]]
Former-commit-id: f14f792377
Former-commit-id: 8a2b16fda0
|
2014-07-07 13:33:35 -04:00 |
|
David Friedman
|
1dba926e1b
|
ASM #15052 - WarnGen: service backup should use config.xml from failed site
Change-Id: Icff8ca2a124da595be6b83ac9f9999831daee0b1
Former-commit-id: 59c9cbaaa6 [formerly b82fb691e0] [formerly 8784501bba] [formerly 8784501bba [formerly a45fe1dad0]] [formerly 59c9cbaaa6 [formerly b82fb691e0] [formerly 8784501bba] [formerly 8784501bba [formerly a45fe1dad0]] [formerly db8977e281 [formerly 8784501bba [formerly a45fe1dad0] [formerly db8977e281 [formerly f9c0dc09ee7bc692c6f70b4a5ad67bb2c2ed5a20]]]]]
Former-commit-id: db8977e281
Former-commit-id: 7f9e063375 [formerly 363de7a3c5] [formerly 5270711c5d] [formerly daaf4137f805b88b1f758e9eab9d6335dafc253c [formerly c850f84db3b8b601f2bbda41059ace7ce49e7f85] [formerly 5270711c5d [formerly d36834080e]]]
Former-commit-id: fc8c6177e61ae3bddbbfdaa47cdd19df3a3f434f [formerly bb504fd33ed91e33e9927f5c6b5ff9592840208c] [formerly c44e9f88f6 [formerly 4f53bbd556]]
Former-commit-id: 07cd7a3068bb263b569ba8fec4a0b01ee0f6a978 [formerly c44e9f88f6]
Former-commit-id: b2c35e26d6
|
2014-07-03 13:58:24 +00:00 |
|
Juliya Dynina
|
07a638790f
|
Merge "ASM #253 Update RadarBiasTableDialog to remove old code." into asm_14.2.2
Former-commit-id: b809f8d0d3 [formerly 3cb8068313] [formerly 67580e73cd] [formerly 67580e73cd [formerly 244b2f5f3a]] [formerly b809f8d0d3 [formerly 3cb8068313] [formerly 67580e73cd] [formerly 67580e73cd [formerly 244b2f5f3a]] [formerly 470d50b4e4 [formerly 67580e73cd [formerly 244b2f5f3a] [formerly 470d50b4e4 [formerly d6ae0d12f104de38b8fa770e4576b96a32da360c]]]]]
Former-commit-id: 470d50b4e4
Former-commit-id: e890482d79 [formerly 813a43336b] [formerly d705c8c8a4] [formerly 36cf8b8d556dda5c99389e4fc1c8a8d0feff236c [formerly 72e68682747424c39bbb0d820e2f6e0c0ed5664e] [formerly d705c8c8a4 [formerly b1cec7d40e]]]
Former-commit-id: 7a195e2ecd55cf4ec6aecb3b0a82150ee3db6dcb [formerly c0a266fcaa2641e6b866cd9366ac8230ded3faa6] [formerly d3073a02a7 [formerly 3f043077b3]]
Former-commit-id: d3073a02a7
Former-commit-id: df5f676026
|
2014-07-02 14:17:11 -05:00 |
|
Steve Harris
|
7d894a6f36
|
Merge branch 'master_14.2.2' (14.2.2-17,18) into omaha_14.2.2
Former-commit-id: d4ca9ee5db [formerly eaa91efeec] [formerly 9b7f820b06] [formerly 9b7f820b06 [formerly 136af3f7e2]] [formerly d4ca9ee5db [formerly eaa91efeec] [formerly 9b7f820b06] [formerly 9b7f820b06 [formerly 136af3f7e2]] [formerly 0ef8a057f9 [formerly 9b7f820b06 [formerly 136af3f7e2] [formerly 0ef8a057f9 [formerly c88d3136dbadab41df5fbf37b4b7c821dfcd07d9]]]]]
Former-commit-id: 0ef8a057f9
Former-commit-id: 59b8a48128 [formerly e33ef8294c] [formerly cb8192cfaf] [formerly 88402b86c308f55dae8ecc2853472fcd1ec41fab [formerly 98fbbbbfbae1101e8159ae2009421c421b3054fd] [formerly cb8192cfaf [formerly 9f61f60f65]]]
Former-commit-id: 1e2f4ef12abc71a605330898650c51735011fdb5 [formerly 8bf30c96c0516a61b493f4f6a6ab8dec379de18a] [formerly a19a11998f [formerly a12a736737]]
Former-commit-id: a19a11998f
Former-commit-id: f1fe74e810
|
2014-07-02 13:38:08 -05:00 |
|
Brian.Dyke
|
49db6ff2d0
|
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: 7ad3b50293 [formerly e68dd70904] [formerly 0fc76ff807] [formerly 0fc76ff807 [formerly d56843d0e8]] [formerly 7ad3b50293 [formerly e68dd70904] [formerly 0fc76ff807] [formerly 0fc76ff807 [formerly d56843d0e8]] [formerly 658cf3dd56 [formerly 0fc76ff807 [formerly d56843d0e8] [formerly 658cf3dd56 [formerly 142e61e538fb094633933e5a2e1244441fc0106b]]]]]
Former-commit-id: 658cf3dd56
Former-commit-id: 1487dd1baa [formerly c3ecdd0017] [formerly c75320efc4] [formerly 428a74d2e08f38921947df32104349936851cb4f [formerly 57abe48bbea6dab9b6ce8e5057dfbbf8a77d3e8d] [formerly c75320efc4 [formerly 380b1d75de]]]
Former-commit-id: 02feec5812764a4c8e7afaceae65ab68e38a2cb5 [formerly 76ce66e268b9af2f519b7f5ef69d4c1046699e5a] [formerly 71c5365af3 [formerly a94ec2062f]]
Former-commit-id: 71c5365af3
Former-commit-id: 38679cddcd
|
2014-07-02 13:18:10 -04:00 |
|
steve.naples
|
d821bcb9b4
|
ASM #253 Update RadarBiasTableDialog to remove old code.
Change-Id: I003f8dbf520e1e8025afe46266d1ee4849003a6f
Former-commit-id: e553f0cf44 [formerly e82b0ae895] [formerly 3d75da3db0] [formerly 3d75da3db0 [formerly 66c3241bc4]] [formerly e553f0cf44 [formerly e82b0ae895] [formerly 3d75da3db0] [formerly 3d75da3db0 [formerly 66c3241bc4]] [formerly 4e959af1b4 [formerly 3d75da3db0 [formerly 66c3241bc4] [formerly 4e959af1b4 [formerly b9f868e0ced53987accf675bfe2ce1a1f4f34da1]]]]]
Former-commit-id: 4e959af1b4
Former-commit-id: 4aae5d3a62 [formerly dbd231a099] [formerly f1c92f1e35] [formerly 35c3cc1f0b7914621d92705313418563b7f51fd0 [formerly 18ba10573377ee74433b2ab0bbbbc0f2efa06dea] [formerly f1c92f1e35 [formerly 3cfabd29bc]]]
Former-commit-id: a40ab40bcbab4e9f1ba1a80614062974b3697ccb [formerly e33d6b9199b205144f76ed9c11a26bf937dec501] [formerly 9f52699bd2 [formerly 93c8f822cc]]
Former-commit-id: 9f52699bd2
Former-commit-id: 0f4f7230ef
|
2014-07-02 15:30:48 +00:00 |
|
Nate Jensen
|
0937b57e62
|
Issue #3337 disable logback packaging data in cave
Former-commit-id: 43f3987ed3 [formerly 2baedbf6b8] [formerly 56363ffc4a] [formerly 56363ffc4a [formerly c003d70168]] [formerly 43f3987ed3 [formerly 2baedbf6b8] [formerly 56363ffc4a] [formerly 56363ffc4a [formerly c003d70168]] [formerly 939fde1575 [formerly 56363ffc4a [formerly c003d70168] [formerly 939fde1575 [formerly db10ba5a37dbe219110f4f902bf9257f2f220b3d]]]]]
Former-commit-id: 939fde1575
Former-commit-id: 971fb54288 [formerly 25379a63f6] [formerly c421e2de75] [formerly d99f24d74eb003f6afdc6cd73a8c4cc0462ed666 [formerly 3c068152fc5db062515196cd9a0c4241b85b8f92] [formerly c421e2de75 [formerly a2cfcd8716]]]
Former-commit-id: 62fc62a52a70771d3b01fee6d65f13134deecba2 [formerly f92a2a465f2193ba867848c40d1d3ca215e457ba] [formerly b54a9694ee [formerly 75ffabbcc2]]
Former-commit-id: b54a9694ee
Former-commit-id: 21d3d905b1
|
2014-07-02 09:24:15 -05:00 |
|
Steve Harris
|
ca55a9b515
|
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: bf48d5d368 [formerly 070e025fb4] [formerly 4882158177] [formerly 4882158177 [formerly 483a69c58d]] [formerly bf48d5d368 [formerly 070e025fb4] [formerly 4882158177] [formerly 4882158177 [formerly 483a69c58d]] [formerly fcecd75dfd [formerly 4882158177 [formerly 483a69c58d] [formerly fcecd75dfd [formerly f947df2bf87c0df3e461be5c6dd72e13a0743f61]]]]]
Former-commit-id: fcecd75dfd
Former-commit-id: 3015f7bdd3 [formerly 8d6e807936] [formerly c59b92895c] [formerly 2781bf1550410ffb61513da53f8c88a8b3ce8342 [formerly 0931821f4ace5f034c8b87a9d38c16b0b9763945] [formerly c59b92895c [formerly 29c2cc0c29]]]
Former-commit-id: 4c8e72aa35adbb189361ae2cb0edad08c6c77f7e [formerly 03a3c04cf900c39d9298620704be5b5397111cbe] [formerly 984b7b1df4 [formerly 998c9a4084]]
Former-commit-id: 984b7b1df4
Former-commit-id: 908e6e908b
|
2014-07-01 18:05:43 -05:00 |
|
Brian.Dyke
|
3400fd59f6
|
Merge branch 'asm_14.2.2' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.2.2
Former-commit-id: 103242de82 [formerly 505d2d7938] [formerly 7b205d97ca] [formerly 7b205d97ca [formerly 3ed9e07c44]] [formerly 103242de82 [formerly 505d2d7938] [formerly 7b205d97ca] [formerly 7b205d97ca [formerly 3ed9e07c44]] [formerly f8759e2317 [formerly 7b205d97ca [formerly 3ed9e07c44] [formerly f8759e2317 [formerly 625eefb5f53e292d947233c1cd0aa031e61ca9ea]]]]]
Former-commit-id: f8759e2317
Former-commit-id: c2786508b5 [formerly dd097258cf] [formerly d5352e6909] [formerly a493c0b120c62bb6900bcb02744cf5f9e97d3536 [formerly 6cf6f19033a93ea38724edb412b097979a9d2b82] [formerly d5352e6909 [formerly f58b4d01a4]]]
Former-commit-id: 03bb269b76f2e60edac05f8ddd2113c489a5d1de [formerly 96d867c32f9a80781d3e59df463ba683a3cec89e] [formerly d58b49a14a [formerly 7d03e29db6]]
Former-commit-id: d58b49a14a
Former-commit-id: 7561401e78
|
2014-07-01 15:41:10 -04:00 |
|
Ron Anderson
|
22b376edaf
|
Omaha #3296 A few more minor performance tweaks and some addtional logging.
Change-Id: Iab603f6f7420a11c5c5cae82df7ebb96f66b0945
(cherry picked from commit 9e6a14877578177e4cfb0c5698097750bde6f280)
Former-commit-id: 75b719bb01 [formerly 319819d3a7] [formerly c7a74ab5b1] [formerly c7a74ab5b1 [formerly 2c5f910f90]] [formerly 75b719bb01 [formerly 319819d3a7] [formerly c7a74ab5b1] [formerly c7a74ab5b1 [formerly 2c5f910f90]] [formerly 4123073c4e [formerly c7a74ab5b1 [formerly 2c5f910f90] [formerly 4123073c4e [formerly a0384ccfb30a877f14893c6cfa62d92117c0bb87]]]]]
Former-commit-id: 4123073c4e
Former-commit-id: ef1f48387c [formerly 9210f3a55d] [formerly 0329b4d8f4] [formerly f317aa76591bfb4a3985936c8b1864ce23d22158 [formerly 0e147fb71ca969d1fc46cffd1962c97ca7cece30] [formerly 0329b4d8f4 [formerly 892eb70952]]]
Former-commit-id: a52b38e617d2d7681a68313249e7c5ed66fdd937 [formerly 05ef0d1dfd0a62197a13dc4c5614043584e047f3] [formerly ac6b3b0b10 [formerly bb91362572]]
Former-commit-id: ac6b3b0b10
Former-commit-id: 26df246878
|
2014-07-01 13:56:41 -04:00 |
|
Ron Anderson
|
fa8cbeed8e
|
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: 7f669f7841 [formerly 1f056e7ab9] [formerly 9818d9b485] [formerly 9818d9b485 [formerly beee08c32b]] [formerly 7f669f7841 [formerly 1f056e7ab9] [formerly 9818d9b485] [formerly 9818d9b485 [formerly beee08c32b]] [formerly 487c7ee30a [formerly 9818d9b485 [formerly beee08c32b] [formerly 487c7ee30a [formerly 49638ba1e9561dea7b318b7adc0f1ab9571170f5]]]]]
Former-commit-id: 487c7ee30a
Former-commit-id: 882b2c197a [formerly 53c11e062a] [formerly 699f2aa9bf] [formerly e4fed4e7f0f2f70d8035bc3df709d942d3c123b7 [formerly b61496c3397723d5bba2b477c82852166c411ddf] [formerly 699f2aa9bf [formerly c16fc8ee7f]]]
Former-commit-id: dba9064d23278a4f8be63c2e7f305cf8ba893307 [formerly 115b6d514da08606bd90d2de458c294ecc3e8d7e] [formerly 2b33bfac7d [formerly 8314f40ec3]]
Former-commit-id: 2b33bfac7d
Former-commit-id: d6ffc28779
|
2014-07-01 13:56:05 -04:00 |
|
Juliya Dynina
|
5b8c8b860c
|
Merge "ASM #663 - WarnGen does not properly handle Outer Banks Counties in North Carolina" into asm_14.2.2
Former-commit-id: 4e49af326b [formerly 9fc999e435] [formerly bf765525b7] [formerly bf765525b7 [formerly b5e4bc1fdc]] [formerly 4e49af326b [formerly 9fc999e435] [formerly bf765525b7] [formerly bf765525b7 [formerly b5e4bc1fdc]] [formerly 102da2d0f7 [formerly bf765525b7 [formerly b5e4bc1fdc] [formerly 102da2d0f7 [formerly 714dbccbd26a1b6fafa486b2ddbce98d7f38c8eb]]]]]
Former-commit-id: 102da2d0f7
Former-commit-id: 5d0465db07 [formerly 174d866359] [formerly b4d23902a7] [formerly 3572afba3b9ad7ba0ba5b7d9d3ac5e66446c3955 [formerly 2d2b83dfaec86884c0ce72c54cf9440fd6074009] [formerly b4d23902a7 [formerly 7ed2a8cbd4]]]
Former-commit-id: b285758e3f08514216d4cd9e2facac56f7c4d6b7 [formerly 4eefb3ff8da1d8b45bbb5382f3de7f17a72b1b23] [formerly 5a9181fcc1 [formerly 8f3581340b]]
Former-commit-id: 86dca47cd6847b4602870b59649ba9bdb00b2669 [formerly 5a9181fcc1]
Former-commit-id: 01f10d8e38
|
2014-07-01 10:05:57 -05:00 |
|
Juliya Dynina
|
c7b4e7bf31
|
Merge "ASM #660 - WarnGen can generate polygons that do not match hatched area" into asm_14.2.2
Former-commit-id: 18555e988b [formerly 0959178a06] [formerly 3ee22b685d] [formerly 3ee22b685d [formerly 0fe04515ad]] [formerly 18555e988b [formerly 0959178a06] [formerly 3ee22b685d] [formerly 3ee22b685d [formerly 0fe04515ad]] [formerly 3aeceabb7a [formerly 3ee22b685d [formerly 0fe04515ad] [formerly 3aeceabb7a [formerly 2260a05df61ec1dc21cc6619fcb48713368e3a46]]]]]
Former-commit-id: 3aeceabb7a
Former-commit-id: 4a0cccc076 [formerly c9d3f1b5d1] [formerly 5c26ceab68] [formerly c60208daa5cd768e19b7cef74b01448f6874cc2a [formerly b03f0ad90da3bfbb7d2a3233ecd2e7b958495f95] [formerly 5c26ceab68 [formerly 39cfec2067]]]
Former-commit-id: 139555c75e0e63dbada4a334d44501b60374cea4 [formerly 2df3731cf0d242cde36a4e9b618c77f44e3aa644] [formerly 5bfd88dd2f [formerly 5d11d65233]]
Former-commit-id: 5bfd88dd2f
Former-commit-id: b000b1f3ac
|
2014-07-01 09:01:55 -05:00 |
|
Sean.Webb
|
28c0ce1bf3
|
ASM #552 - Increased postgres max_connections to 400
Change-Id: I6e4a3c02ff2645480ca20274f1fa445e25196a03
Former-commit-id: 0861a3cc62 [formerly 4aa35df7c7] [formerly 5288764393] [formerly 5288764393 [formerly c24c2f1e3e]] [formerly 0861a3cc62 [formerly 4aa35df7c7] [formerly 5288764393] [formerly 5288764393 [formerly c24c2f1e3e]] [formerly 0b29e66772 [formerly 5288764393 [formerly c24c2f1e3e] [formerly 0b29e66772 [formerly add5d004eca457782f957a95262e880b91dfeeb1]]]]]
Former-commit-id: 0b29e66772
Former-commit-id: fdb6c50ed2 [formerly 010d6b9516] [formerly cd179cddff] [formerly 76e3ed997ff6389bac871f6c26cadf3164768a73 [formerly fb4ad3bfb75666fa94af0badd60456d9cfcc4290] [formerly cd179cddff [formerly a875ae3f24]]]
Former-commit-id: f007c4d908b18dde74584675962428184d495b02 [formerly bc0c747f1f72f5b7593a653e0a4748bab19eab8d] [formerly 342896c0d7 [formerly c9d3906b32]]
Former-commit-id: 779c7fb100275fe3e34403bc53588d8fb71e8c63 [formerly 342896c0d7]
Former-commit-id: 1b7f4a8121
|
2014-06-30 16:06:25 -04:00 |
|
Qinglu.Lin
|
5de2b4522f
|
ASM #663 - WarnGen does not properly handle Outer Banks Counties in North Carolina
Change-Id: If7fbcea362618e0dea5153f65489388b406b7a81
Former-commit-id: 012e92eda4 [formerly 660d1c9ff2] [formerly 1180b31875] [formerly 1180b31875 [formerly 1200633cd2]] [formerly 012e92eda4 [formerly 660d1c9ff2] [formerly 1180b31875] [formerly 1180b31875 [formerly 1200633cd2]] [formerly 1d52d020eb [formerly 1180b31875 [formerly 1200633cd2] [formerly 1d52d020eb [formerly 4d50beaed59d785d923e357f8ce036f6625ce4b4]]]]]
Former-commit-id: 1d52d020eb
Former-commit-id: 4816a6e7ce [formerly 712f3b0f46] [formerly 5e07f13dd8] [formerly 0afe93c9566de730f8bdf57585055d9c9d658c55 [formerly 79c9a926a4430a2e87a6959f559d52c89cb1c374] [formerly 5e07f13dd8 [formerly 6e4b7e1e6d]]]
Former-commit-id: 847cdb1c5db15ac22c8316b68161f4842a8d1670 [formerly d7eb9af4998b1fcd67d349f3068f4af192e86aff] [formerly 7235488050 [formerly 3eaedad105]]
Former-commit-id: 7235488050
Former-commit-id: a4d359fce0
|
2014-06-30 13:09:15 -04:00 |
|
David Friedman
|
3589e08d71
|
ASM #660 - WarnGen can generate polygons that do not match hatched area
Change-Id: I48e93e69d75e903b266f5bb615dd8a72e8813652
Former-commit-id: ef3e254a32 [formerly 5c62d368ea] [formerly c4967a96fb] [formerly c4967a96fb [formerly 18b3b61afc]] [formerly ef3e254a32 [formerly 5c62d368ea] [formerly c4967a96fb] [formerly c4967a96fb [formerly 18b3b61afc]] [formerly dc25040a25 [formerly c4967a96fb [formerly 18b3b61afc] [formerly dc25040a25 [formerly 993663cbee3f794981fc7f4cc97f96e3b86c47f8]]]]]
Former-commit-id: dc25040a25
Former-commit-id: fe97d81e3e [formerly 2e4cf863dd] [formerly 217aa6ce76] [formerly b94b57fa518134c39d9cc9a2308e81174e2c8ab3 [formerly 7b3bdb180812815c4f2d1bc65959d40cce07d595] [formerly 217aa6ce76 [formerly b546ca6ac8]]]
Former-commit-id: 5d4639faeb9760dfd77594abae006074331cfe04 [formerly d5d8e4678be9cbb6c94920e0cb97562c13b4888f] [formerly 18b1d17550 [formerly a756c1436b]]
Former-commit-id: 18b1d17550
Former-commit-id: f2728065ba
|
2014-06-27 19:17:55 +00:00 |
|
Mike Duff
|
2711df84f8
|
Issue #3321 - Fix ingest switch checks
Change-Id: I7de7ee482ab57789874a179499e6c51079e68e12
Former-commit-id: 8e1cb0860f [formerly 0de6d3b92a] [formerly 1d3aeb881b] [formerly 1d3aeb881b [formerly f17c93bb19]] [formerly 8e1cb0860f [formerly 0de6d3b92a] [formerly 1d3aeb881b] [formerly 1d3aeb881b [formerly f17c93bb19]] [formerly d62c925baa [formerly 1d3aeb881b [formerly f17c93bb19] [formerly d62c925baa [formerly 5df0ac7f96d1280c1c50f39982693f9503b56f14]]]]]
Former-commit-id: d62c925baa
Former-commit-id: 46dd1d5b2f [formerly 9c869c928e] [formerly 5078011147] [formerly 43487876a516afc6f1846a368373cf08ed83c27d [formerly 939d0365bdd8eecc342c0665f97c4d8d8697f445] [formerly 5078011147 [formerly d2cbeff06a]]]
Former-commit-id: aeebb8a06dac422403a10782fa235463d65b51ad [formerly cc2d0bb3117f698401c903f5221926bbed77ac62] [formerly 6163364939 [formerly 07dda3ecc1]]
Former-commit-id: 6163364939
Former-commit-id: b88d5fc6e7
|
2014-06-26 16:23:02 -05:00 |
|
Brian.Dyke
|
6fa7e2fa14
|
Merge branch 'master_14.2.2' into asm_14.2.2
Former-commit-id: 279aa9d039 [formerly 5b88408af1] [formerly a48268a1d6] [formerly a48268a1d6 [formerly a5ae302690]] [formerly 279aa9d039 [formerly 5b88408af1] [formerly a48268a1d6] [formerly a48268a1d6 [formerly a5ae302690]] [formerly 3df14b5a94 [formerly a48268a1d6 [formerly a5ae302690] [formerly 3df14b5a94 [formerly 632577244e843dd122c00b745e973730c7920246]]]]]
Former-commit-id: 3df14b5a94
Former-commit-id: 5136340bc4 [formerly 6da2ede9a5] [formerly 88411f7f52] [formerly da250da7ec313c463b779e8615c01cec9ca360a2 [formerly 83724e09627d39b69b326bff065865d4439a3263] [formerly 88411f7f52 [formerly 97619031c9]]]
Former-commit-id: c22b1c77d00da020c106f795d02071500792f9ac [formerly e982c4d9565c1143f60c3bb8c3d493b9960113bd] [formerly a1d171c6c3 [formerly 9197f47f29]]
Former-commit-id: a1d171c6c3
Former-commit-id: 3295154a2b
|
2014-06-26 10:39:49 -04:00 |
|
Ron Anderson
|
67eaa9f1aa
|
Issue #3317 Fix merge problem that removed GFE notification of D2D purge
Change-Id: I925b7287bdb2fb7f9c330b05b1b2c32031e693d9
Former-commit-id: b0d923d407 [formerly 8c0311507b] [formerly 5dd7a035ac] [formerly 5dd7a035ac [formerly ead09dd683]] [formerly b0d923d407 [formerly 8c0311507b] [formerly 5dd7a035ac] [formerly 5dd7a035ac [formerly ead09dd683]] [formerly a6956a8ccd [formerly 5dd7a035ac [formerly ead09dd683] [formerly a6956a8ccd [formerly 04805a8957ef14754225f85f4722d8302cde8df3]]]]]
Former-commit-id: a6956a8ccd
Former-commit-id: 32b4023d1e [formerly 81db7329c7] [formerly 8b027efdec] [formerly 7e3c39d210fa0e5224a474bf9ecbe89ba34c215a [formerly 95a171c25d2d56a721f156a97720989d676e8e63] [formerly 8b027efdec [formerly 7abeff57cc]]]
Former-commit-id: 7c6fd60714682b4ff30121206e1b3b1fca965b85 [formerly efa4e25bb2ebffaf63718fb148cb9143abea2252] [formerly b4a2ae3aae [formerly e5b81ccee0]]
Former-commit-id: b4a2ae3aae
Former-commit-id: 9e022261ae
|
2014-06-25 19:12:51 +00:00 |
|
Ron Anderson
|
489cb8b3e1
|
Issue #3317 Fix issue with obsolete D2DGridDatabases not getting purged.
Change-Id: If792327215bb9f8db470c95099463e735c462d46
Former-commit-id: bb299cebb1 [formerly cdef6bd26c] [formerly f76a2d3700] [formerly f76a2d3700 [formerly 898b30fadb]] [formerly bb299cebb1 [formerly cdef6bd26c] [formerly f76a2d3700] [formerly f76a2d3700 [formerly 898b30fadb]] [formerly 2ac9cd84ec [formerly f76a2d3700 [formerly 898b30fadb] [formerly 2ac9cd84ec [formerly 2a84ea1af7bb767e9e85387de1fd90c662f9f91d]]]]]
Former-commit-id: 2ac9cd84ec
Former-commit-id: ed8c09f701 [formerly 0076ccb311] [formerly ddcfe574d8] [formerly f3aec0839e72b0a8b797e6c5a31b1463e17634c8 [formerly 63b195143dbea5ac0724f5f746efdcdd457eeade] [formerly ddcfe574d8 [formerly ff5c0f2c33]]]
Former-commit-id: 87eaf7d7546e82316c83489423c0da857d45c6d2 [formerly 35d631e2502a21703771a49f440d628b03dfec10] [formerly 849625a3e1 [formerly 2cc92ecc69]]
Former-commit-id: 849625a3e1
Former-commit-id: f48167eb8d
|
2014-06-25 13:21:32 -05:00 |
|
Steve Harris
|
62efd009c2
|
Merge branch 'master_14.2.2' (master_14.2.2-15) into omaha_14.2.2
Former-commit-id: cb5a2d2819 [formerly 7f040f069c] [formerly 3f2058a1ab] [formerly 3f2058a1ab [formerly 89606076ec]] [formerly cb5a2d2819 [formerly 7f040f069c] [formerly 3f2058a1ab] [formerly 3f2058a1ab [formerly 89606076ec]] [formerly ddc6f2092a [formerly 3f2058a1ab [formerly 89606076ec] [formerly ddc6f2092a [formerly 174fe6d66525229f328846a1f4564300d7603c10]]]]]
Former-commit-id: ddc6f2092a
Former-commit-id: ffa5b82dec [formerly dd6d6c031d] [formerly 304d918a7c] [formerly 9f238d4c8afc47f8cbd50ca3130ec7730458c3e7 [formerly 018aec814b6ca7a979cdc1b5c53150d6797d0df5] [formerly 304d918a7c [formerly 1f033d22e6]]]
Former-commit-id: 758b630793800d90ed9bfd28c6bef43ba8fe6c97 [formerly 7b12be7aa1ce8ea1ba2ec797cf62aa5d09c44514] [formerly 2841134c60 [formerly 323c240f59]]
Former-commit-id: 68773dc3e2bc99241d914107c58728cfc830bb41 [formerly 2841134c60]
Former-commit-id: 6285d3dac6
|
2014-06-24 10:57:56 -05:00 |
|
steve.naples
|
8ee8454215
|
ASM #253 Update RadarBiasTableDialog to allow undo changes.
Change-Id: Ibfb87730fda8185b27777fd83606bc1397aca1f9
Former-commit-id: 156627cf0d [formerly e994aa9482] [formerly 2a49bbda2f] [formerly 2a49bbda2f [formerly efe877d82b]] [formerly 156627cf0d [formerly e994aa9482] [formerly 2a49bbda2f] [formerly 2a49bbda2f [formerly efe877d82b]] [formerly 90ed511478 [formerly 2a49bbda2f [formerly efe877d82b] [formerly 90ed511478 [formerly fcd20d35abf3617701cc797baf9ba2b3984379c8]]]]]
Former-commit-id: 90ed511478
Former-commit-id: f9dfca5999 [formerly b8d5f833ec] [formerly 2e77b74c44] [formerly b2ebe2d78e31b3b202f763caf56debc427d03d0d [formerly f502e650f306b12ad50f762f688616a9b1039de1] [formerly 2e77b74c44 [formerly 362e1ce880]]]
Former-commit-id: a899165e6e709944af5594d4e8a7938bbafd3b11 [formerly d75382cb3e72ed1c52902aa0d9f71c8e7e9c77f6] [formerly 3638879057 [formerly 5dcda5cabc]]
Former-commit-id: 3638879057
Former-commit-id: d7ff8a2638
|
2014-06-24 15:52:23 +00:00 |
|
Nate Jensen
|
51379991fa
|
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 007e4f89b9 [formerly e39ecf5473] [formerly 4558fe5862] [formerly 4558fe5862 [formerly 845483346f]] [formerly 007e4f89b9 [formerly e39ecf5473] [formerly 4558fe5862] [formerly 4558fe5862 [formerly 845483346f]] [formerly 65eb76ff66 [formerly 4558fe5862 [formerly 845483346f] [formerly 65eb76ff66 [formerly 599f2598f711ce2ae6ac69ed78a90502a84d2716]]]]]])
Former-commit-id: 529574b1be [formerly ef9e4c2439] [formerly 333f8317bb] [formerly 333f8317bb [formerly ca27873204]] [formerly 529574b1be [formerly ef9e4c2439] [formerly 333f8317bb] [formerly 333f8317bb [formerly ca27873204]] [formerly 65619399a0 [formerly 333f8317bb [formerly ca27873204] [formerly 65619399a0 [formerly f0ad63d2ccf347e92274701f9890e120b9e70140]]]]]
Former-commit-id: 65619399a0
Former-commit-id: 0a776c582c [formerly 8bd6177ae8] [formerly 3add021413] [formerly 0ed1eabccf5d92809062ab221b2f608105ac26b8 [formerly 848ea22f8aa30435c636b4df2b4d2bebcb508ed9] [formerly 3add021413 [formerly f9fce25836]]]
Former-commit-id: e33d43a6356a7c4e7dec7655e3b0362c74d648bf [formerly 2afe008a92baa2a5e2c3477d56f0dceac797e9ae] [formerly e62629413d [formerly e717dbfeb1]]
Former-commit-id: e62629413d
Former-commit-id: 764d34448d
|
2014-06-23 11:59:26 -05:00 |
|
Nate Jensen
|
fc18772a2a
|
Issue #3307 fix xml serialization of looping field
Former-commit-id: 9ad5729107 [formerly cfd3efcfe2] [formerly c7c0d9cb4b] [formerly c7c0d9cb4b [formerly 51da67dd3f]] [formerly 9ad5729107 [formerly cfd3efcfe2] [formerly c7c0d9cb4b] [formerly c7c0d9cb4b [formerly 51da67dd3f]] [formerly 97ef9fc343 [formerly c7c0d9cb4b [formerly 51da67dd3f] [formerly 97ef9fc343 [formerly c6ce72840a4ee0f44eacff46015b5382d86dd47f]]]]]
Former-commit-id: 97ef9fc343
Former-commit-id: 8b139556f9 [formerly 1d50803d20] [formerly 416e6fc85d] [formerly 13535875e068296f0a01d0d753851d9ed07253aa [formerly 2bea2ce9efcdf786438dba2900ce1aaaf1cf5e3b] [formerly 416e6fc85d [formerly a3c20eb98a]]]
Former-commit-id: 33f94849f97c22c9777df393c751b202cdfcbd33 [formerly 49f94b32b485b3b8042a4e7e0f9a84d3a790f3e7] [formerly b1ab93a361 [formerly 9a3a4d5bfd]]
Former-commit-id: b1ab93a361
Former-commit-id: 18e78f42d9
|
2014-06-23 09:54:11 -05:00 |
|
Steve Harris
|
eca5b25817
|
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: 37b3b421db [formerly 869235c02a] [formerly 16f5ff0979] [formerly 16f5ff0979 [formerly b84dda5930]] [formerly 37b3b421db [formerly 869235c02a] [formerly 16f5ff0979] [formerly 16f5ff0979 [formerly b84dda5930]] [formerly 419c5f4aba [formerly 16f5ff0979 [formerly b84dda5930] [formerly 419c5f4aba [formerly ce5767f2bbf5c9627bd43e766c6193c261c48af3]]]]]
Former-commit-id: 419c5f4aba
Former-commit-id: 8e58645759 [formerly bab435f286] [formerly af06c5a890] [formerly a279361a319d31856e62ae271287fe2634f63eea [formerly dd639a780b77ef5a2f827ee961c20e9db23d2d31] [formerly af06c5a890 [formerly 66d30e59a3]]]
Former-commit-id: e21ac397453f253cbebf9ec8143ee59c17397567 [formerly 27bd7f3ff5ce8e46cd91569a3f0cf62fa9127e53] [formerly 196f53e609 [formerly 935542914d]]
Former-commit-id: 196f53e609
Former-commit-id: 7e7529e482
|
2014-06-20 14:01:55 -04:00 |
|
Brian.Dyke
|
4ab4b1ef0c
|
CM-MERGE:OB13.5.6-4 into 14.1.3
Former-commit-id: 48fb810c83 [formerly e3dc97e246] [formerly be589ceb9b] [formerly be589ceb9b [formerly 399c06820a]] [formerly 48fb810c83 [formerly e3dc97e246] [formerly be589ceb9b] [formerly be589ceb9b [formerly 399c06820a]] [formerly 8ecdd9a192 [formerly be589ceb9b [formerly 399c06820a] [formerly 8ecdd9a192 [formerly 86dc406cd227362abc5274f4cd64813ceb91d00d]]]]]
Former-commit-id: 8ecdd9a192
Former-commit-id: c220a11003 [formerly f09000ec64] [formerly e28febcf27] [formerly 00089684d6f405bf63b66585cb6f0cb2bd6fb18d [formerly 9723a25d830a41cf2e060dc218ad841643217c3e] [formerly e28febcf27 [formerly 9031f58d02]]]
Former-commit-id: 9b1a982118aacc5098b56968eb1784574b216c56 [formerly c6144f8a9f4e5c44b2c2c7442f0100f646622fba] [formerly b602d29456 [formerly 3e10995d87]]
Former-commit-id: 6ae36b38dc1dffb3b54c97f99b7dad83ade736bc [formerly b602d29456]
Former-commit-id: 71ca3ae180
|
2014-06-18 08:55:49 -04:00 |
|
Brian.Dyke
|
1e729613f8
|
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: 5c0b97b76e [formerly 232d538288] [formerly 06c565d74f] [formerly 06c565d74f [formerly 30d8644fa5]] [formerly 5c0b97b76e [formerly 232d538288] [formerly 06c565d74f] [formerly 06c565d74f [formerly 30d8644fa5]] [formerly 482f915b42 [formerly 06c565d74f [formerly 30d8644fa5] [formerly 482f915b42 [formerly 4b317062ce5c35823210cbbf023c0f0fc8051ef3]]]]]
Former-commit-id: 482f915b42
Former-commit-id: 918b86f916 [formerly aa70f67645] [formerly c1bd7a0c55] [formerly 46307e8d1397653cec699d540ba855d45cf63fcd [formerly aa11101c8c0f5e91cdf9e5a2ddbd70bdcc0dd9a3] [formerly c1bd7a0c55 [formerly 072a4a9d63]]]
Former-commit-id: 77fbe6879e2cc11095fb32bb6a4f362159425186 [formerly 220ffe796aa220960bdf60c9b20ae4086c78d256] [formerly 03f8202ff2 [formerly ce9ebc90f5]]
Former-commit-id: 03f8202ff2
Former-commit-id: 8a771cc705
|
2014-06-13 14:05:49 -04:00 |
|
Brian.Dyke
|
ed5c00ea5a
|
CM-MERGE:OB13.5.6-3 into 14.1.3
Former-commit-id: ba58bbcd77 [formerly 4766b3f49f] [formerly 5064d24e26] [formerly 5064d24e26 [formerly 346bf852cd]] [formerly ba58bbcd77 [formerly 4766b3f49f] [formerly 5064d24e26] [formerly 5064d24e26 [formerly 346bf852cd]] [formerly 81832d97e5 [formerly 5064d24e26 [formerly 346bf852cd] [formerly 81832d97e5 [formerly df99fcb0a4be27d5f2d22935847fb55b8bfbbb58]]]]]
Former-commit-id: 81832d97e5
Former-commit-id: f006987ffc [formerly ba9fb22f58] [formerly 764b729546] [formerly ee586f90e14b167d58641dbc7c9e583cb6604475 [formerly 4b8123012f6cebd56dd11d52a9381b3f0d930dd0] [formerly 764b729546 [formerly 4bca0769fb]]]
Former-commit-id: 66a8b9b5691732e24c9735d11ae269fa91542f68 [formerly 6a3a4bbef432d2ba4ec423342a3283d6354a3f92] [formerly 3da13f3d12 [formerly 766974a05d]]
Former-commit-id: c43fdf68fb7918d59e8a1f15a1c6665510306bbb [formerly 3da13f3d12]
Former-commit-id: 54db4c05b5
|
2014-06-13 13:21:19 -04:00 |
|
Steve Harris
|
6807d244e9
|
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: 773379d7cb [formerly 61cb3f45b4] [formerly 3a3277c469] [formerly 3a3277c469 [formerly ad6e9fa5ee]] [formerly 773379d7cb [formerly 61cb3f45b4] [formerly 3a3277c469] [formerly 3a3277c469 [formerly ad6e9fa5ee]] [formerly 9510608b74 [formerly 3a3277c469 [formerly ad6e9fa5ee] [formerly 9510608b74 [formerly cf56d49dc5a197fa114fa6c468860d63621a9cdc]]]]]
Former-commit-id: 9510608b74
Former-commit-id: 804c0f54cd [formerly a18a176b4f] [formerly f78bc57920] [formerly fa7385f2fb7c9674f6814c292c612da7faa9aad8 [formerly 3c82f5e3d74beb4ba9dff59b89b9c241d9fea0d9] [formerly f78bc57920 [formerly 23dea36a2c]]]
Former-commit-id: b4a9fbf65ee2698cec917c13d27bf0e4d3c10fcf [formerly fd8723b0332dc846ef24dcb7bd7b484cb4592bd5] [formerly 435da06069 [formerly 5a86a00518]]
Former-commit-id: 435da06069
Former-commit-id: 2f5548b43d
|
2014-06-11 12:55:44 -05:00 |
|
David Friedman
|
46a46e5363
|
ASM #604 - Lightning display varies depending how long CAVE has been open
Change-Id: Id85b87e21833ef00e80693b8526d976ccb4bb63e
Former-commit-id: ab1edc5b0d [formerly 350566a514] [formerly 6d0d3f5ba5] [formerly 6d0d3f5ba5 [formerly b8542c1332]] [formerly ab1edc5b0d [formerly 350566a514] [formerly 6d0d3f5ba5] [formerly 6d0d3f5ba5 [formerly b8542c1332]] [formerly 1c84c31e30 [formerly 6d0d3f5ba5 [formerly b8542c1332] [formerly 1c84c31e30 [formerly a3f4fd6537f3847011e199e0f043968d9f595937]]]]]
Former-commit-id: 1c84c31e30
Former-commit-id: 0043392b22 [formerly 5d2dcfe9c8] [formerly 0ba91c6c28] [formerly 2529829eb645cd41b67c39311d40c47c15740fb7 [formerly 2134244bb7c5f6877ba479473585ac3ff2a3cceb] [formerly 0ba91c6c28 [formerly 8c8f54994b]]]
Former-commit-id: ee8b6a4193c68e3461a3118178beaf2469ef9f45 [formerly 84d4ad89f719f3725ff0576bdad2b7cdfef1cdd6] [formerly 3b686ca052 [formerly d50646b479]]
Former-commit-id: 3b686ca052
Former-commit-id: b373fea52f
|
2014-06-11 13:37:16 +00:00 |
|
Brian.Dyke
|
d4db1ed8e9
|
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: e46de9cb1a [formerly 7056d79f70] [formerly 0f07e14bf1] [formerly 0f07e14bf1 [formerly f72380ad60]] [formerly e46de9cb1a [formerly 7056d79f70] [formerly 0f07e14bf1] [formerly 0f07e14bf1 [formerly f72380ad60]] [formerly 9ab17ddecb [formerly 0f07e14bf1 [formerly f72380ad60] [formerly 9ab17ddecb [formerly 797aa6bfbf2802aa7355b7a4a77d0fb4f54dfd6a]]]]]
Former-commit-id: 9ab17ddecb
Former-commit-id: 28ccd9ecc0 [formerly 5893782ec3] [formerly 816dcf74e4] [formerly 57cdbcea8780144a4444063478dccb85ddbc4c69 [formerly d838e1972c1a8529e2efc996d44a235ce685e8db] [formerly 816dcf74e4 [formerly 49cd9574d9]]]
Former-commit-id: 0d019fed510d7de771ca0535a93e09b4ae8af7ee [formerly b46938d836881d648f671f55d48408d36e6cb22f] [formerly 1ae1410e46 [formerly a4b39dfca5]]
Former-commit-id: 9b065abc04253aaf413ebdfaa1eb4821960d6127 [formerly 1ae1410e46]
Former-commit-id: f5befd7116
|
2014-06-10 13:56:03 -04:00 |
|
Brian.Dyke
|
ade575138d
|
CM-MERGE:OB13.5.6-1,-2 into 14.1.3
Former-commit-id: f512b9c51e [formerly 64a10ce12d] [formerly ef5c74dece] [formerly ef5c74dece [formerly c1b3f9d180]] [formerly f512b9c51e [formerly 64a10ce12d] [formerly ef5c74dece] [formerly ef5c74dece [formerly c1b3f9d180]] [formerly 8874d41872 [formerly ef5c74dece [formerly c1b3f9d180] [formerly 8874d41872 [formerly b859032bcec187616adfd414dd1ce5fe27829e9e]]]]]
Former-commit-id: 8874d41872
Former-commit-id: 2c9cdbd7b6 [formerly d6ebcad87e] [formerly 4f0fc67b1f] [formerly 5a09a2a2fc07851b1a02ee853528cabdf2c91146 [formerly c763da54d370b72fa17bd0154f839ff80cd9226a] [formerly 4f0fc67b1f [formerly f568b5606a]]]
Former-commit-id: a96ceafe13347c19b02a306f8b8e4b0d3f27c638 [formerly cb4c4f5cdbcafd5e7f18339757c3484f03c17e30] [formerly a39afc1dfa [formerly 81d732477e]]
Former-commit-id: a39afc1dfa
Former-commit-id: 7caa757318
|
2014-06-10 12:52:59 -04:00 |
|
Steve Harris
|
7c0fef496c
|
Merge branch 'master_14.2.2' (14.2.2-12) into omaha_14.2.2
Former-commit-id: 22561b7e78 [formerly 483d61f414] [formerly 6e09bce335] [formerly 6e09bce335 [formerly 14370245fd]] [formerly 22561b7e78 [formerly 483d61f414] [formerly 6e09bce335] [formerly 6e09bce335 [formerly 14370245fd]] [formerly bd98f04cde [formerly 6e09bce335 [formerly 14370245fd] [formerly bd98f04cde [formerly 65793ec4d12626b2d3365c5a0e8c3e229972b289]]]]]
Former-commit-id: bd98f04cde
Former-commit-id: 9828522e5c [formerly 69d90af81f] [formerly 2445542f10] [formerly 2657a20700ed2baa8a82452c5ff8563d901eb5d8 [formerly 053a4d7ccdcd52fb49e7e7bdd39b7346b3706960] [formerly 2445542f10 [formerly c11a44259e]]]
Former-commit-id: 90888eb4e5674e3f55c44dd7a9544b116f23ee3b [formerly e341f6ab52dbb4bf615dc2cbe67c9dddfb50c0c3] [formerly 67b4501d9b [formerly 2569e13053]]
Former-commit-id: 9467f0fc732c3a5627171323d78123405a52b0c0 [formerly 67b4501d9b]
Former-commit-id: 460828069f
|
2014-06-09 15:20:03 -05:00 |
|
Mike Duff
|
b521ac55a1
|
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: ec821ebdcd [formerly b2162559fe] [formerly b876d9755a] [formerly b876d9755a [formerly 81ab64d7ff]] [formerly ec821ebdcd [formerly b2162559fe] [formerly b876d9755a] [formerly b876d9755a [formerly 81ab64d7ff]] [formerly 39173c380c [formerly b876d9755a [formerly 81ab64d7ff] [formerly 39173c380c [formerly 7fe0dae041cb68aba968e22d5895cce22a210ee6]]]]]
Former-commit-id: 39173c380c
Former-commit-id: d64ce45dd3 [formerly 7316895b98] [formerly 60fe02137f] [formerly 8962160518d216decc8e0ccde5789784a0eff068 [formerly 218dced89f74bad34c2dfce78c1142304822bd73] [formerly 60fe02137f [formerly b880d171d4]]]
Former-commit-id: 81bdffb0ffb74abf6dd04df63a3213501d452ac9 [formerly f76ab4fcf17730eb720be95ca87a67c136734004] [formerly bb122607cc [formerly 4b9f707a06]]
Former-commit-id: bb122607cc
Former-commit-id: f1dd41a042
|
2014-06-06 16:03:14 -04:00 |
|
Xuezhi.Wei
|
cb11c62f2c
|
ASM #579 - shef-ingest.xml updates for performance tracking
Change-Id: If3b24f8385e955d003d79e22605d4536321c73b2
Former-commit-id: 597865bd7c [formerly ba05b6f16a] [formerly 81ec03e291] [formerly 81ec03e291 [formerly bdbeec662c]] [formerly 597865bd7c [formerly ba05b6f16a] [formerly 81ec03e291] [formerly 81ec03e291 [formerly bdbeec662c]] [formerly 33b235a0a4 [formerly 81ec03e291 [formerly bdbeec662c] [formerly 33b235a0a4 [formerly f7b5f3bbc71cc251e19f1764ee7756050895b7a3]]]]]
Former-commit-id: 33b235a0a4
Former-commit-id: b7e28ab359 [formerly 869427a96a] [formerly e2f7548351] [formerly 5efc2abaa923f657865f07c696d74b044921c29f [formerly 4364d6d4c712093350ad1d6bb73a1c9077cfb53c] [formerly e2f7548351 [formerly 445d58699a]]]
Former-commit-id: fd4e7b751b83ed11d96e298e11f9d933d7450bf2 [formerly 52a1669a642727f3a804c657a32769c37b04af1c] [formerly 6911a1f357 [formerly ae0a348358]]
Former-commit-id: 6911a1f357
Former-commit-id: 8550a855da
|
2014-06-06 17:40:09 +00:00 |
|
Juliya Dynina
|
78fe1b7521
|
Merge "ASM #114 - Problem with Distance Speed Tool." into asm_14.2.2
Former-commit-id: a23f4a0264 [formerly 1b61a32634] [formerly 21cd415434] [formerly 21cd415434 [formerly 80a83bd44c]] [formerly a23f4a0264 [formerly 1b61a32634] [formerly 21cd415434] [formerly 21cd415434 [formerly 80a83bd44c]] [formerly 87216a87de [formerly 21cd415434 [formerly 80a83bd44c] [formerly 87216a87de [formerly 1e1c7cbcee94e782338d440d585a3217ad606725]]]]]
Former-commit-id: 87216a87de
Former-commit-id: df3c469258 [formerly d807e4c657] [formerly 8d89e35985] [formerly a044281b6028eed7c610469f295f686c10c04184 [formerly 01c388eee593213b036d8a0380d954c53ca38d29] [formerly 8d89e35985 [formerly b6a4959e21]]]
Former-commit-id: 57579424e415951d7e6c657590b3e2c7467585ee [formerly 38821b70bd70a3e19e76dace2f65ab0d4cb9690b] [formerly c5d4d8308e [formerly 93c2e97e2e]]
Former-commit-id: c5d4d8308e
Former-commit-id: c165d815fa
|
2014-06-06 09:50:36 -05:00 |
|
Sean Webb
|
4d60338820
|
Merge "ASM #611 fix to MHS issues in DR_17297" into asm_14.2.2
Former-commit-id: d167fa04e4 [formerly 52283357c8] [formerly e0f9eabb45] [formerly e0f9eabb45 [formerly 016648ffaf]] [formerly d167fa04e4 [formerly 52283357c8] [formerly e0f9eabb45] [formerly e0f9eabb45 [formerly 016648ffaf]] [formerly cb43d21243 [formerly e0f9eabb45 [formerly 016648ffaf] [formerly cb43d21243 [formerly 5556e19903965bea22ca2f11b51fcc1c95cb07f8]]]]]
Former-commit-id: cb43d21243
Former-commit-id: 40f06ef646 [formerly b196247c36] [formerly b35f945bec] [formerly fd7366ae96ad44d0f3d8ed1f1e6a4a1436c266e4 [formerly 4706f754c942852a68f343f015e6e1efe8ea3f83] [formerly b35f945bec [formerly c52983ab68]]]
Former-commit-id: 17474474ae36f580735e773b57e7efd2d9742024 [formerly d9784dae569d3e3b65f6850c52ce7fab092a38df] [formerly 45d5701876 [formerly 4e6fa39e5e]]
Former-commit-id: 45d5701876
Former-commit-id: a421f14d07
|
2014-06-05 15:03:11 -05:00 |
|
Fay.Liang
|
ff20b8c647
|
ASM #611 fix to MHS issues in DR_17297
Change-Id: Ie32edc0bac5458e3d356a0b6b3deea0f8d520cb7
Former-commit-id: 1642b5ad69 [formerly 46926b679d] [formerly fa2cdbfac1] [formerly fa2cdbfac1 [formerly d1aa160aa7]] [formerly 1642b5ad69 [formerly 46926b679d] [formerly fa2cdbfac1] [formerly fa2cdbfac1 [formerly d1aa160aa7]] [formerly c5e6daa943 [formerly fa2cdbfac1 [formerly d1aa160aa7] [formerly c5e6daa943 [formerly fc06896ae4d9adf0973522313f5e65df6ac67fa4]]]]]
Former-commit-id: c5e6daa943
Former-commit-id: 9ee7815eca [formerly 4c11888976] [formerly 40eeef7fd1] [formerly b58f7e5dbe7d73c3c2a5d064510182c289101fa6 [formerly 03458502710ffda685e54402a1e36d9e18ebbf95] [formerly 40eeef7fd1 [formerly 39efc11cb3]]]
Former-commit-id: 03b5a286b76ea8c056ba50c1479712ccc4e81caa [formerly 1894dd6372d16ff3ad9763a5fc2c17a4e819ca79] [formerly 1ddb7a2b0b [formerly ce1e19955e]]
Former-commit-id: 1ddb7a2b0b
Former-commit-id: 143da74890
|
2014-06-05 15:49:27 -04:00 |
|
Mike Duff
|
61c02f5265
|
Issue #3222 - Fix for SHEF posting times
Former-commit-id: 69ea8c6dc0 [formerly 3a3928cde3] [formerly 28a42f3f10] [formerly 28a42f3f10 [formerly 8a5acd085d]] [formerly 69ea8c6dc0 [formerly 3a3928cde3] [formerly 28a42f3f10] [formerly 28a42f3f10 [formerly 8a5acd085d]] [formerly f5f101d416 [formerly 28a42f3f10 [formerly 8a5acd085d] [formerly f5f101d416 [formerly 3f1f9cf4fa6207edae642db5cffdc8284091f31a]]]]]
Former-commit-id: f5f101d416
Former-commit-id: d4e7854db3 [formerly e89e9975c5] [formerly 8e6a50e2ee] [formerly 3698559f84cf720c566507aa3243295e130e77b0 [formerly 63be3054ca051657de6e1a1480a28374ac8bc854] [formerly 8e6a50e2ee [formerly 87d41ff302]]]
Former-commit-id: 31a9b08cab23cdfd407b35c373c2dea8e1f1e9ac [formerly 298e4a841acd8adf70326608c890a015d030d238] [formerly c2751cf532 [formerly a615c41a57]]
Former-commit-id: c2751cf532
Former-commit-id: e54d8dd946
|
2014-06-05 09:35:07 -05:00 |
|
Michael Gamazaychikov
|
0324991ba7
|
ASM #114 - Problem with Distance Speed Tool.
Change-Id: I2b3218b2fb407f99cf9c81edf69feb042a6fee75
Former-commit-id: 9c8ea9175b [formerly efd0fb50b8] [formerly e5a9fa0827] [formerly e5a9fa0827 [formerly c07bcacbf8]] [formerly 9c8ea9175b [formerly efd0fb50b8] [formerly e5a9fa0827] [formerly e5a9fa0827 [formerly c07bcacbf8]] [formerly 50ab77046b [formerly e5a9fa0827 [formerly c07bcacbf8] [formerly 50ab77046b [formerly a38308fa5a6efe9a07ecd84bd93662bea32afc94]]]]]
Former-commit-id: 50ab77046b
Former-commit-id: 0ec2896a37 [formerly fc5acb6bcb] [formerly a2423cfadc] [formerly b40093b9faa61b20a9a359277a1abd5814e2eb35 [formerly a99f478987db9b40c18652f3f209154a8dfc3177] [formerly a2423cfadc [formerly 5efb82ea3e]]]
Former-commit-id: e8b0cdce3cdf55a8a7b31e9d96c3de482663ffb0 [formerly 177375df5384d0a8fa51c23b24915e671ade7ce1] [formerly 94595e6af4 [formerly 29e197404f]]
Former-commit-id: 94595e6af4
Former-commit-id: b3afeb981b
|
2014-06-05 13:43:04 +01:00 |
|
Zhidong.Hao
|
feded336ef
|
ASM #106 - AvnFPS Monitor TAF valid time display different from A1
Change-Id: Iddf3f4ee46b94f28494dc15764b91f38c0176325
Former-commit-id: 32c623ab36 [formerly 43e1a5a909] [formerly ccbda4db4f] [formerly ccbda4db4f [formerly 26c6801620]] [formerly 32c623ab36 [formerly 43e1a5a909] [formerly ccbda4db4f] [formerly ccbda4db4f [formerly 26c6801620]] [formerly 71ab6b9ed0 [formerly ccbda4db4f [formerly 26c6801620] [formerly 71ab6b9ed0 [formerly 74597b2630ffd8d984b193f72126a9a5d0b3a942]]]]]
Former-commit-id: 71ab6b9ed0
Former-commit-id: 2f9dd94b32 [formerly 460b543c6d] [formerly 9094e822e0] [formerly a97817d6e623293e125b572eeef60377a2d5ed84 [formerly c17aa2176430d3a612529390ab4b68f86ac03181] [formerly 9094e822e0 [formerly e5c47a51eb]]]
Former-commit-id: 0c91131a2c004657f1ede35d5efaf2b2e5bd2b40 [formerly 16d700e0af2365b3ff5388b53260c131a361d620] [formerly 33086a8085 [formerly 3a9abec04b]]
Former-commit-id: 33086a8085
Former-commit-id: e842be1d53
|
2014-06-03 11:55:32 -04:00 |
|
brian.dyke
|
518480bd8c
|
Merge branch 'master_14.2.2' into asm_14.2.2
Former-commit-id: edbd578a6b [formerly e1f9c919e6] [formerly 2f53c2e385] [formerly 2f53c2e385 [formerly 7dde6e1d04]] [formerly edbd578a6b [formerly e1f9c919e6] [formerly 2f53c2e385] [formerly 2f53c2e385 [formerly 7dde6e1d04]] [formerly ee7c67f7b0 [formerly 2f53c2e385 [formerly 7dde6e1d04] [formerly ee7c67f7b0 [formerly d7b707236a1ee3bca45dee26c10814d9e3c275c8]]]]]
Former-commit-id: ee7c67f7b0
Former-commit-id: a94a22d93a [formerly b2b232c2cc] [formerly 8b93c973d6] [formerly 140d1359f08a6f39d3743304502b2c21e3bfe161 [formerly 5b345e8fad1dba7b952e789980e9a6f6873f05eb] [formerly 8b93c973d6 [formerly cf49a7217f]]]
Former-commit-id: e8abfe300f87a8ec1b13a9ee4af2e3ff338c5cfc [formerly 1c3c352f258fa1fe750be56c373b425249190beb] [formerly a5b2f384bf [formerly 05f691d0cd]]
Former-commit-id: a5b2f384bf
Former-commit-id: 37b3baed83
|
2014-05-30 10:07:12 -04:00 |
|
Matthew Howard
|
82647dc953
|
Merge "ASM #209 - Fix Svcbu cleanup script" into asm_14.2.2
Former-commit-id: f56a7363c8 [formerly d0880003a6] [formerly 099185c960] [formerly 099185c960 [formerly 781d0331ab]] [formerly f56a7363c8 [formerly d0880003a6] [formerly 099185c960] [formerly 099185c960 [formerly 781d0331ab]] [formerly 8375a2af3e [formerly 099185c960 [formerly 781d0331ab] [formerly 8375a2af3e [formerly def2351f527613dd62a081161e5f3a87756493ec]]]]]
Former-commit-id: 8375a2af3e
Former-commit-id: fa6bfc36cf [formerly b7f3c5798e] [formerly 11216ced25] [formerly f3550e2053ebdf50b9cc3fd74bd334ad8a4179b4 [formerly d46f8a355df86411c1f5283003df72a741dbec12] [formerly 11216ced25 [formerly f68748bd63]]]
Former-commit-id: b05da114cf4d29e6707d4938f1c817b41a83cec3 [formerly 46ac2ea21d50d92b8371c417dd9b8efffd8f82a9] [formerly db35baefc8 [formerly 04c0631701]]
Former-commit-id: 73645e6e0ff128c0963ae67a41946e83c2f50c38 [formerly db35baefc8]
Former-commit-id: 904a3b24f7
|
2014-05-29 15:54:37 -05:00 |
|
Shawn.Hooper
|
44a5341426
|
ASM #209 - Fix Svcbu cleanup script
Change-Id: I4da44d4c410c03769e556dc6abca62db52880997
Former-commit-id: 497f09b8ff [formerly 4de35d0a2b] [formerly 08ad9a66cc] [formerly 08ad9a66cc [formerly fe567b2a5b]] [formerly 497f09b8ff [formerly 4de35d0a2b] [formerly 08ad9a66cc] [formerly 08ad9a66cc [formerly fe567b2a5b]] [formerly 5cf0579d20 [formerly 08ad9a66cc [formerly fe567b2a5b] [formerly 5cf0579d20 [formerly 626ee991cd7e9dbfe52342abd9e3fd41b973f72a]]]]]
Former-commit-id: 5cf0579d20
Former-commit-id: c86c6c7a5e [formerly 94ec109216] [formerly 0fe034cc8b] [formerly 163b579bad9d06939490803207681a155f895e08 [formerly 1363ea6a68426295d8f737eab6b4aff6d84a7400] [formerly 0fe034cc8b [formerly 2c476e2bb4]]]
Former-commit-id: 285aec9be7f81de9c123ef17f51c5530921b469f [formerly 5db8829a63e68c0d2815ce3a3cb52cffe50787a0] [formerly a4de244bdb [formerly 3cb14aecd9]]
Former-commit-id: a4de244bdb
Former-commit-id: 8fe8f54975
|
2014-05-29 16:56:46 -04:00 |
|
Steve Harris
|
4979fbe7e2
|
Merge branch 'master_14.2.2' (14.2.2-9,10,11) into omaha_14.2.2
Former-commit-id: c8ab465357 [formerly 74b0099fdf] [formerly 53645445fe] [formerly 53645445fe [formerly c7ef7878f5]] [formerly c8ab465357 [formerly 74b0099fdf] [formerly 53645445fe] [formerly 53645445fe [formerly c7ef7878f5]] [formerly 9313e045bf [formerly 53645445fe [formerly c7ef7878f5] [formerly 9313e045bf [formerly 03b376033b3374694bc8a6e0a2c55b830db058e1]]]]]
Former-commit-id: 9313e045bf
Former-commit-id: 5519f0463f [formerly 774a5c516c] [formerly 947d44c945] [formerly 6ad7d4ce0b4e6b01ac241717c456a509cedfa8c6 [formerly 67033e82aff16def433329064a8788daafb7920f] [formerly 947d44c945 [formerly e92b927c5a]]]
Former-commit-id: aba45fac86da5ebbebde4651ad5d42e0b8927f2f [formerly 75fff8fc4c85753165134554cdcdbacca2a82acc] [formerly 0571a7877b [formerly ba06fa79f9]]
Former-commit-id: 0571a7877b
Former-commit-id: 265c5e4811
|
2014-05-29 07:45:24 -05:00 |
|
Brian.Dyke
|
6ee4c4dbdb
|
Merge remote-tracking branch 'remotes/origin/master_14.2.1' into master_14.2.2 CM-MERGE:14.2.1-30 into 14.2.2
Former-commit-id: 36dc7d1e9d [formerly 9e0cf9b945] [formerly 47a37b112a] [formerly 47a37b112a [formerly b7ef9420e1]] [formerly 36dc7d1e9d [formerly 9e0cf9b945] [formerly 47a37b112a] [formerly 47a37b112a [formerly b7ef9420e1]] [formerly 574246b6d4 [formerly 47a37b112a [formerly b7ef9420e1] [formerly 574246b6d4 [formerly f2763f73cf3e5f2d9e66efa6e481dbf66f16e7da]]]]]
Former-commit-id: 574246b6d4
Former-commit-id: 5778faa16a [formerly 7d8cb95e95] [formerly 45d59380ea] [formerly c2d135d753b49c4cf96c32b53fe8f647c1f326e9 [formerly 8dc10058004612f82f3168b336f93c36d1945933] [formerly 45d59380ea [formerly 2c1fabb0f8]]]
Former-commit-id: b54e88b482c738629343727043904976134bb80a [formerly c03dd203d258e405f3ff9771fe66b95d7dbeaaea] [formerly 1bae94a61a [formerly 551def9f1a]]
Former-commit-id: f86f27701c0e23c45aa1992da0734f52fec63174 [formerly 1bae94a61a]
Former-commit-id: 9784438847
|
2014-05-28 16:25:33 -04:00 |
|
Brian.Dyke
|
3d447b3dbe
|
Merge branch 'master_14.1.2' into master_14.2.1 CM-MERGE:OB14.1.2-10 into 14.2.1
Former-commit-id: 1bba2340c9 [formerly 0fe87c550c] [formerly 6f64664e70] [formerly 6f64664e70 [formerly 4c010cf27a]] [formerly 1bba2340c9 [formerly 0fe87c550c] [formerly 6f64664e70] [formerly 6f64664e70 [formerly 4c010cf27a]] [formerly ce81b44f32 [formerly 6f64664e70 [formerly 4c010cf27a] [formerly ce81b44f32 [formerly b92ce0c1589c48de73387c142f1302409a3b0cb7]]]]]
Former-commit-id: ce81b44f32
Former-commit-id: 2141617d41 [formerly 90a397bd7e] [formerly 4f434e1bf9] [formerly 1fee2f0d1df61fe0c3d591fb71ea95ca9714ee16 [formerly 1509b1f949c311ae098b3a9a2397fccd0508dc1c] [formerly 4f434e1bf9 [formerly 73ec45c5b2]]]
Former-commit-id: f88449bef5863a998d340e6798f606fd8a235e6f [formerly d276945aa3a9c7c155010ce4bc7455ff38448cbc] [formerly 992186e641 [formerly f5bc17ef24]]
Former-commit-id: 992186e641
Former-commit-id: ee83737427
|
2014-05-28 09:36:15 -04:00 |
|