Melissa Porricel
|
a0c765b5ae
|
ASM #15557 - Restore ability to display HPCGuide2.5
Change-Id: Ibdcdd0aa95e406b5cd886dc8f51e74a3cde54d17
Change-Id: I5594c2151026247d48e657a30c7b4f94b14f036f
Former-commit-id: f31b16a859 [formerly 73063fd894] [formerly 1e5bef6820] [formerly 1e5bef6820 [formerly d3c29b834d]] [formerly f31b16a859 [formerly 73063fd894] [formerly 1e5bef6820] [formerly 1e5bef6820 [formerly d3c29b834d]] [formerly 1f7cf4a165 [formerly 1e5bef6820 [formerly d3c29b834d] [formerly 1f7cf4a165 [formerly 5998e7ad9690e3b87805c75dcb711d299e8f1427]]]]]
Former-commit-id: 1f7cf4a165
Former-commit-id: 66854c8e3e [formerly 947f8af4f5] [formerly c6a7e3bf85] [formerly 8a3673792d1ef3381b80742a46939cf1ce6eb155 [formerly 8b541032eb4107eb1eec145f9fb65a2bc7646063] [formerly c6a7e3bf85 [formerly 055dd5133f]]]
Former-commit-id: a10f5758cceb487336343b5c0a24799b75d303ce [formerly 7df85cbc2358a5b5de17f326afad5075b5ab2140] [formerly 60bae53945 [formerly 408f192088]]
Former-commit-id: 55e3c221feb505cd4d16fce220e8687d3a93394a [formerly 60bae53945]
Former-commit-id: 87e582fdbd
|
2014-07-10 16:15:12 -04:00 |
|
Mike Duff
|
d9259c6df8
|
Issue #3370 - Fix for mulitple shef types in same file.
Change-Id: I23110d7887b68ff073afdf61815d7dced9c4a3ad
Former-commit-id: f2e3e6c359 [formerly 6ce3e57525] [formerly e3b7a99388] [formerly e3b7a99388 [formerly b5b61650d3]] [formerly f2e3e6c359 [formerly 6ce3e57525] [formerly e3b7a99388] [formerly e3b7a99388 [formerly b5b61650d3]] [formerly 30655cf2ca [formerly e3b7a99388 [formerly b5b61650d3] [formerly 30655cf2ca [formerly 0c0b14929f74f2262559a4919171623870139313]]]]]
Former-commit-id: 30655cf2ca
Former-commit-id: 9438e9db35 [formerly 031ee7b5f5] [formerly 7a988c92fa] [formerly 9d029bb8d499d64a08e20d3ce21b006a55db7149 [formerly 66304b48c28db98c6ef9c79bc64ab65a2cf95669] [formerly 7a988c92fa [formerly 69fb1ccf35]]]
Former-commit-id: 84280ecdc4f2226a0b397b0fb63d3344b5ea6082 [formerly 8fdf0fbb56028776ff8455c543d6f2b5a36bd7f4] [formerly 918b247d79 [formerly 2c0488534a]]
Former-commit-id: 918b247d79
Former-commit-id: 107df0dc7c
|
2014-07-10 10:05:05 -05:00 |
|
Ron Anderson
|
449c0f3f04
|
Issue #3146 Added check for duplicate smartInit.
Added alertViz message for GFE site activation failure
Change-Id: I68a2b995922ac9ba7e75d02f317357fddde7f004
Former-commit-id: 7c78d28a95 [formerly 6ead047f79] [formerly 9f4e89347a] [formerly 9f4e89347a [formerly 0c0739bd72]] [formerly 7c78d28a95 [formerly 6ead047f79] [formerly 9f4e89347a] [formerly 9f4e89347a [formerly 0c0739bd72]] [formerly 468668e19b [formerly 9f4e89347a [formerly 0c0739bd72] [formerly 468668e19b [formerly eafc406ec75d5e1a1bbc93bb0b472a053922eb3a]]]]]
Former-commit-id: 468668e19b
Former-commit-id: 0d1a783be8 [formerly d5ca7c1946] [formerly ed7f6f731e] [formerly 79304e1b96440f254fd345accedc2a4f8ae3cdcf [formerly 0931f5b4440dd2ba692f9bb4936037c9fa726c26] [formerly ed7f6f731e [formerly a917ea16a4]]]
Former-commit-id: e51f58326df440df9b4f409e44a1c4e8434e89d6 [formerly 3e581ed3fa19d9091ff5fec898f8df6848dda333] [formerly f7b8803180 [formerly 7877809108]]
Former-commit-id: f7b8803180
Former-commit-id: ac5d683940
|
2014-07-09 16:42:43 -05:00 |
|
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 |
|
Steve Harris
|
e155f91938
|
Merge branch 'master_14.3.1' (14.3.1-12) into omaha_14.3.1
Former-commit-id: bbcae6e52b [formerly 6a7aeb3557] [formerly f68e051938] [formerly f68e051938 [formerly 1c8dc56d49]] [formerly bbcae6e52b [formerly 6a7aeb3557] [formerly f68e051938] [formerly f68e051938 [formerly 1c8dc56d49]] [formerly 30cdbff7f8 [formerly f68e051938 [formerly 1c8dc56d49] [formerly 30cdbff7f8 [formerly 382c772c196711d230395f34a04559c188880622]]]]]
Former-commit-id: 30cdbff7f8
Former-commit-id: dc180f85a6 [formerly 3369bc4a1d] [formerly a4d91c59d6] [formerly bb4576ffe3bccfcdbb7bd53cd66aeb47ec9b5a73 [formerly f86265bab0c346864e940cc8c360ec5235644553] [formerly a4d91c59d6 [formerly 6f9129ac78]]]
Former-commit-id: 862e2f47da6f90189dcaba2f74495293fb7eeb61 [formerly 6030625bf5e788ecaebe0b3ec7cdd364685df43e] [formerly 15267970e4 [formerly d600ed9acf]]
Former-commit-id: 4bacb88aadfe8f048f90ba9da4f9d270b27422c5 [formerly 15267970e4]
Former-commit-id: 7408b3e09d
|
2014-07-01 13:38:18 -05: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 |
|
Steve Harris
|
7a29f74a3d
|
Merge branch 'master_14.2.2' (-16) into master_14.3.1 (-11) CM-MERGE:14.2.2-11,-12,-13,-14,-15,-16 into 14.3.1
Conflicts:
cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/sbu/ServiceBackupDlg.java
cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/GisUtil.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/PortionsUtil.java
edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/postProcessModels/postProcessedModels.xml
edexOsgi/com.raytheon.edex.plugin.shef/res/spring/shef-ingest.xml
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
Change-Id: Ia1c3637d1d6ee482896c9d7a41d77752d70317f5
Former-commit-id: b2ca44adc7 [formerly 741dc31fcb] [formerly 2f2958df37] [formerly 2f2958df37 [formerly d4dc1723c1]] [formerly b2ca44adc7 [formerly 741dc31fcb] [formerly 2f2958df37] [formerly 2f2958df37 [formerly d4dc1723c1]] [formerly 7acd9ab2dd [formerly 2f2958df37 [formerly d4dc1723c1] [formerly 7acd9ab2dd [formerly d25ab509cb53d559edbd520dd1e3c036166f2e29]]]]]
Former-commit-id: 7acd9ab2dd
Former-commit-id: 020a525bfd [formerly d70da4127e] [formerly 7fb4663d75] [formerly 3e0604521c6e7522f3a4123eee8600cb5a71226f [formerly 109f5e557e8f5a7076b56c4f8d0f0c548c0f0cc6] [formerly 7fb4663d75 [formerly dcbab5621f]]]
Former-commit-id: 9365f3461acd78bd354b2cc5cd317b9d8c76d98e [formerly 8343b8e876918b72044e0b509f5b5b8afdbd53e2] [formerly 8fb747ad27 [formerly 71357da9d2]]
Former-commit-id: 8fb747ad27
Former-commit-id: 1bbbdc9c62
|
2014-07-01 11:08:46 -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 |
|
Ben Steffensmeier
|
2d2124828e
|
Issue #2661 Fix grid time series errors when there is no data.
Former-commit-id: 38c22bdc75 [formerly 886e738c6f] [formerly 2c1988017e] [formerly 2c1988017e [formerly aaa146b2d0]] [formerly 38c22bdc75 [formerly 886e738c6f] [formerly 2c1988017e] [formerly 2c1988017e [formerly aaa146b2d0]] [formerly 46b8688597 [formerly 2c1988017e [formerly aaa146b2d0] [formerly 46b8688597 [formerly 2fdb5867131b54f5d74ef3edd8c621c8807d4d99]]]]]
Former-commit-id: 46b8688597
Former-commit-id: 521562bbff [formerly a638ba05b1] [formerly 9edc1153de] [formerly 17247f4e728878e24be1aed6db6e041d63824dea [formerly 91aee63991f0525d37934c2e6dc7774e0f24ffb3] [formerly 9edc1153de [formerly c184936340]]]
Former-commit-id: 3580c4a3f4c73de11db866513e558aadddc95e2e [formerly 1e516e8c449d0c3d54c14bc6e3374606e4c9e7af] [formerly 364953e5b7 [formerly 17e92d31bd]]
Former-commit-id: 364953e5b7
Former-commit-id: e683a9e5b9
|
2014-06-24 10:57:02 -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 |
|
Nate Jensen
|
dab7aa95cf
|
Issue #3248 ensure that a locking file output streams obtains the lock
before calling the FileOutputStream constructor
Change-Id: I210ac789322c975cb93584facb3eec417f5097f2
Former-commit-id: 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: 65eb76ff66
Former-commit-id: 19639b1bd7 [formerly 64a5a09639] [formerly 0ea72ce3ed] [formerly 6bc93622808f1d68484339fbfae539fccd5777c6 [formerly 7625d4517e0d02b91a3866165e133f7bafff76e3] [formerly 0ea72ce3ed [formerly d1766dc991]]]
Former-commit-id: 28711ce1882ab35ca18726e928d1d776e368de48 [formerly 8cb49b65383dad6568360de99d14592be1576599] [formerly 55aa294dad [formerly 0d1d12158d]]
Former-commit-id: 55aa294dad
Former-commit-id: 9cc5ac0325
|
2014-06-19 10:02:34 -05: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 Clements
|
d48875043d
|
Issue #2903 prevent shared display crash from missing point style enum value
Change-Id: I9d3faccba56c2832c5dcc185c6c20bcce396b173
Former-commit-id: 5a4f4319b8 [formerly ccac7c3d47] [formerly b8a0a60df6] [formerly b8a0a60df6 [formerly 9946f78241]] [formerly 5a4f4319b8 [formerly ccac7c3d47] [formerly b8a0a60df6] [formerly b8a0a60df6 [formerly 9946f78241]] [formerly 5d03048fff [formerly b8a0a60df6 [formerly 9946f78241] [formerly 5d03048fff [formerly 5d298b39786d37aa365ccfe2c337214d1e46f1a9]]]]]
Former-commit-id: 5d03048fff
Former-commit-id: e29cc654c7 [formerly 424e910953] [formerly dbe778cbe0] [formerly 0382c1ffb8e900a6ac7630dbecdc308015b20081 [formerly e21697c67a7f70581429d5de01d62bdd8589e8e9] [formerly dbe778cbe0 [formerly 59d92634b0]]]
Former-commit-id: a09002483a7bf56dcde45daa8700170c19d96a78 [formerly 7a2a949eba2c4f80c7fff71719a70d5f4ae9e7ec] [formerly ed95461c36 [formerly 48e634b14a]]
Former-commit-id: ed95461c36
Former-commit-id: d75be4a64c
|
2014-06-17 17:01:23 -05:00 |
|
Nate Jensen
|
d64286b3b0
|
Merge "Issue #2903 changed collaboration jaxb xml to be base64 encoded" into omaha_14.3.1
Former-commit-id: c11968887a [formerly 8ce9a5e5b8] [formerly eddc8f373a] [formerly eddc8f373a [formerly c2aa87470d]] [formerly c11968887a [formerly 8ce9a5e5b8] [formerly eddc8f373a] [formerly eddc8f373a [formerly c2aa87470d]] [formerly ed36453f09 [formerly eddc8f373a [formerly c2aa87470d] [formerly ed36453f09 [formerly 93f63c0d42941001e4d59a4840df5e5b525592bf]]]]]
Former-commit-id: ed36453f09
Former-commit-id: eb4d7b6d4c [formerly a7de352bc1] [formerly 50715cc012] [formerly 4da32a0cfa803f8a2c57bb57cf478dfd5ebdd52f [formerly b555e7ee30d9051470c8a8d81f5bb009419c6e82] [formerly 50715cc012 [formerly ef61539a8a]]]
Former-commit-id: fee0376c7da2e2229c7130e86a21ae96ab4b19fe [formerly 99700c1ab56b3871ef108964d94e2f4a3ce6d83e] [formerly cc66519671 [formerly 48496aeb9b]]
Former-commit-id: 0e167fcbd900b7559037266778ca2cc745bc74b8 [formerly cc66519671]
Former-commit-id: 071a95ebbf
|
2014-06-16 08:31:30 -05:00 |
|
Steve Harris
|
b6b1150a22
|
Merge branch 'master_14.3.1' (14.3.1-10,11) into omaha_14.3.1
Former-commit-id: 0d9eab4572 [formerly e67900933d] [formerly 0c3dcb77d5] [formerly 0c3dcb77d5 [formerly 1d2b8aeb7b]] [formerly 0d9eab4572 [formerly e67900933d] [formerly 0c3dcb77d5] [formerly 0c3dcb77d5 [formerly 1d2b8aeb7b]] [formerly 6c82cc5c3d [formerly 0c3dcb77d5 [formerly 1d2b8aeb7b] [formerly 6c82cc5c3d [formerly 4041e8afbb4bf1c0c416624140d74d27e963f9c8]]]]]
Former-commit-id: 6c82cc5c3d
Former-commit-id: adfb249f2a [formerly 34f28938b1] [formerly f2d30c4c62] [formerly 7bb2dc2db1fb72e1433c8a323ff6a1ccb901ee91 [formerly f88aa0bf4cc8943e9c3579e1603952778df08b40] [formerly f2d30c4c62 [formerly 7a8741d8fa]]]
Former-commit-id: 6f4ed8722faa25e2d379fe959e04bfe50684f339 [formerly eacce1e23bead5748ab0a4cd4dc7222001a909e9] [formerly e0be1f390e [formerly 61112bc258]]
Former-commit-id: e0be1f390e
Former-commit-id: 97d29ef9f9
|
2014-06-16 07:49:58 -05: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 |
|
Brian Clements
|
b684fba6b5
|
Issue #2903 changed collaboration jaxb xml to be base64 encoded
Change-Id: I0de0db3bf455a14d747520f34ef66d986815e42c
Former-commit-id: 1676a51d57 [formerly 89a5679714] [formerly 909561d871] [formerly 909561d871 [formerly 5424eb0258]] [formerly 1676a51d57 [formerly 89a5679714] [formerly 909561d871] [formerly 909561d871 [formerly 5424eb0258]] [formerly ef0ecfd1d4 [formerly 909561d871 [formerly 5424eb0258] [formerly ef0ecfd1d4 [formerly afcfdf1ed08cd64deb085b909f0965e4ab68d92d]]]]]
Former-commit-id: ef0ecfd1d4
Former-commit-id: 660e6c46f2 [formerly b6232bbe1f] [formerly 077976c912] [formerly c2913d867ad6a729cf6609f1ec7a095cbc579179 [formerly 8512eec3b1257faf9bbe8ce48adddd95718600b1] [formerly 077976c912 [formerly 9e39c19a7d]]]
Former-commit-id: 28a51a94c36aa34ec33858421dda9b7d568faf2c [formerly f3e969013d91de867a66a8a214bde6496e5d096f] [formerly 88bc3a948e [formerly 649d0cf43f]]
Former-commit-id: 88bc3a948e
Former-commit-id: 6a9f323dc0
|
2014-06-12 13:40:33 -05:00 |
|
Brian.Dyke
|
f7c96f0090
|
Merge branch 'field_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: de15c48acc [formerly c4ecd90117] [formerly e802508e98] [formerly e802508e98 [formerly a011c0b6bb]] [formerly de15c48acc [formerly c4ecd90117] [formerly e802508e98] [formerly e802508e98 [formerly a011c0b6bb]] [formerly 6fcc2604e0 [formerly e802508e98 [formerly a011c0b6bb] [formerly 6fcc2604e0 [formerly 0d441b5eebad07acf51d6d5c28ee5ac7770d9733]]]]]
Former-commit-id: 6fcc2604e0
Former-commit-id: 294c51bb56 [formerly 319c42800a] [formerly 50073f34b2] [formerly c398d7416a08af0a8ced49cbaad0611bc2c13813 [formerly 06a7320d681143eaedbb5dc395076f3968649812] [formerly 50073f34b2 [formerly 10696504a0]]]
Former-commit-id: 5cc64476423fb3bc79e959e9c21d9de8d624b15e [formerly 9d9acc84599e418a839ea20c9dba7c2ad790dc86] [formerly 40fb1f6159 [formerly ac235bf20a]]
Former-commit-id: 40fb1f6159
Former-commit-id: c7ea1d14a4
|
2014-06-12 07:07:17 -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 |
|
Ana Rivera
|
7207577670
|
VLab Issue #3943, #3648 - fixes SwIT DR_17413 (ref: DCS_266), and fixes DR_16999
Change-Id: I51c576c4ea40367d21e0d395d1e1a5ad1437969e
Former-commit-id: b987656628 [formerly c1e504cdfa] [formerly 4b515bfd0a] [formerly 4b515bfd0a [formerly 65e90953c2]] [formerly b987656628 [formerly c1e504cdfa] [formerly 4b515bfd0a] [formerly 4b515bfd0a [formerly 65e90953c2]] [formerly 9da58db461 [formerly 4b515bfd0a [formerly 65e90953c2] [formerly 9da58db461 [formerly 83640ccce75b600d53a0d44ae1528c312b7947b5]]]]]
Former-commit-id: 9da58db461
Former-commit-id: b45b77f5df [formerly 0d7b0bd224] [formerly e249a71765] [formerly d01dc81812668d65a10f534d058f3bb9420744d7 [formerly 127510ed332577a010a023c75dc1fcecd022d0b6] [formerly e249a71765 [formerly 540a286595]]]
Former-commit-id: c1fbf763c149f16bb8b34f69302d7c978c347f6c [formerly 3cc1d10a8464122ec97adf27ec9a0a37f75958f3] [formerly eb270f539a [formerly 5721d2df05]]
Former-commit-id: eb270f539a
Former-commit-id: c48edea423
|
2014-06-11 17:35:55 +00: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 |
|
dmsys
|
acb29721d0
|
Merge branch 'ohd_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: cac543e59d [formerly ca9a4ac6fb] [formerly fc77941b88] [formerly fc77941b88 [formerly b7cfb9e752]] [formerly cac543e59d [formerly ca9a4ac6fb] [formerly fc77941b88] [formerly fc77941b88 [formerly b7cfb9e752]] [formerly 1f0a6112c7 [formerly fc77941b88 [formerly b7cfb9e752] [formerly 1f0a6112c7 [formerly 161ffe72d115c7846697afa8be559d2f5fd199da]]]]]
Former-commit-id: 1f0a6112c7
Former-commit-id: 91c80729a7 [formerly a8e144476a] [formerly f85d84246f] [formerly c205584063c4507ce139507e9e594c7440248f68 [formerly 17ca0f25d2213832508bb0d62b7865a4e3af8ce7] [formerly f85d84246f [formerly c377233491]]]
Former-commit-id: eb366d47362874d331fb2448b53d72bfff69f12c [formerly bfd469314ed751ac7dc958a9b23b15bd99ab5f3e] [formerly 770c42f203 [formerly 76a9b2bdee]]
Former-commit-id: 770c42f203
Former-commit-id: ace43a7b1d
|
2014-06-10 17:17:26 -04:00 |
|
Ben Steffensmeier
|
9709bbd007
|
Issue #2661 Fix vector derived parameter.
Former-commit-id: 54471606c9 [formerly 6f21122f93] [formerly 1f270a6059] [formerly 1f270a6059 [formerly cd60dc028a]] [formerly 54471606c9 [formerly 6f21122f93] [formerly 1f270a6059] [formerly 1f270a6059 [formerly cd60dc028a]] [formerly 0a66c47341 [formerly 1f270a6059 [formerly cd60dc028a] [formerly 0a66c47341 [formerly 238043b8c4286e398176d4d6c78e585e33faa5da]]]]]
Former-commit-id: 0a66c47341
Former-commit-id: c86863bb51 [formerly 054332bba4] [formerly 07731bab04] [formerly 89c1ebeb3ed52e5c09a2ef49a2c686bcc3b5a0ef [formerly ffde9f4f15837ec13b10838ca62ccdef3678f11a] [formerly 07731bab04 [formerly 799f7baacc]]]
Former-commit-id: a5377907d21c918262dde511c5177032f3cb37a5 [formerly 7955676bb65b512551599f7705453af7fa83ed5e] [formerly 97976eea56 [formerly 90f23e48ad]]
Former-commit-id: 97976eea56
Former-commit-id: b61f1420ee
|
2014-06-10 15:44:33 -05: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 |
|