xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
237 commits 31 branches 40 tags 3.8 GiB
Commit graph

128 commits

Author SHA1 Message Date
Ben Steffensmeier
4c897de4a8 Issue #189 minor fixes to grid for issues discovered during dev tests 
Former-commit-id: 735099e934 [formerly fa380d06c1] [formerly 23da6e6494] [formerly 735099e934 [formerly fa380d06c1] [formerly 23da6e6494] [formerly 509c09ebb0 [formerly 23da6e6494 [formerly 4ae112f6fcc9c2d0bb8715033a80d265dbdfe8b4]]]]
Former-commit-id: 509c09ebb0
Former-commit-id: 21ce531c20 [formerly 4cacd4a7b1] [formerly 627ed14f2e45b950eb951d0e5438cdc4375e3303 [formerly 59754c0f6a]]
Former-commit-id: f6701bf3b87cd3a761f14792a180ae78fbb00546 [formerly b3a945b203]
Former-commit-id: 069958385b
 2012-10-10 16:32:36 -05:00
Ben Steffensmeier
f38f15036f Issue #189 update grid resource reprojection to match ss_builds 
Former-commit-id: b6c6543bed [formerly 326acb6c15] [formerly c503a9b94c] [formerly b6c6543bed [formerly 326acb6c15] [formerly c503a9b94c] [formerly a6168a2e88 [formerly c503a9b94c [formerly 4a2a57ae5e7b380141910106aa016c6c4ef46d82]]]]
Former-commit-id: a6168a2e88
Former-commit-id: 788cd01af7 [formerly 2c82f142ca] [formerly 07a39cc465cd988ae0573e4334384317c8422139 [formerly 8c21bc8510]]
Former-commit-id: b1963967640e7220f2aa9ad3485d0630b63d4561 [formerly ab90613e0b]
Former-commit-id: 2ab0828bae
 2012-10-10 16:32:33 -05:00
Ben Steffensmeier
3de7a47d51 Issue #189 fix merge issue with derived parameters going from 12.4 to 12.5 
Former-commit-id: 265018e965 [formerly 7750b6259c] [formerly 5fe75cb57f] [formerly 265018e965 [formerly 7750b6259c] [formerly 5fe75cb57f] [formerly 666fe70a71 [formerly 5fe75cb57f [formerly f35c55683ab90289526f500b3bc2b623ded433e5]]]]
Former-commit-id: 666fe70a71
Former-commit-id: bb5349896f [formerly c8bf67f7fc] [formerly 4d0775a3a8041333fb70eb3377a02e3e9e700ae1 [formerly fcf5cba055]]
Former-commit-id: bd7d4fb4ea45f9473a05b77ea310e87776ce446d [formerly 12bdf84fbf]
Former-commit-id: 97533d3341
 2012-10-01 15:41:38 -05:00
Ben Steffensmeier
2495d79171 Issue #189 convert hydro and hydrocommon to grid. 
Former-commit-id: a5c60f0f13 [formerly 3e0da6d171] [formerly 8d150d404c] [formerly a5c60f0f13 [formerly 3e0da6d171] [formerly 8d150d404c] [formerly 3e93e8980b [formerly 8d150d404c [formerly a84fcbd045c24c16b30df4328aaf3bbbb30efd17]]]]
Former-commit-id: 3e93e8980b
Former-commit-id: f976af446f [formerly 3a1ba7bd87] [formerly 9c843ec0f10baa33a6447d47f517d98afd981744 [formerly 734922cb44]]
Former-commit-id: 15a7c506481d5aff6c1d5b18c5778b910456537a [formerly 24e6010646]
Former-commit-id: d3f7a486e7
 2012-10-01 14:05:40 -05:00
Ben Steffensmeier
de863143f7 Issue #189 switch GL to use regular floats so it works with very samll values and NaN. 
Former-commit-id: 518fadf1d1 [formerly 6441db74b0] [formerly b5df6b6ef4] [formerly 518fadf1d1 [formerly 6441db74b0] [formerly b5df6b6ef4] [formerly 0a0597302f [formerly b5df6b6ef4 [formerly f850384883b1faaf3f1092aa2a40cac89b952c5f]]]]
Former-commit-id: 0a0597302f
Former-commit-id: 9b5abe464b [formerly a9d7ca9e96] [formerly 6e7a652c48cb1c7220a6f390ddfe133b7f8702d5 [formerly 3477060b44]]
Former-commit-id: 4bb93cd6a2ee65886fc201af29494832411c4fe4 [formerly 6e7617f611]
Former-commit-id: fa5cbdea32
 2012-10-01 13:19:00 -05:00
Ben Steffensmeier
66c734714e Issue #189 convert sounding/cloudheight to grid. 
Former-commit-id: 4743e17c7a [formerly b67376efc9] [formerly 7544986f1f] [formerly 4743e17c7a [formerly b67376efc9] [formerly 7544986f1f] [formerly 7efbc19f81 [formerly 7544986f1f [formerly 4a95bbc65642b688d67fb67faf8d76aed10d2f7c]]]]
Former-commit-id: 7efbc19f81
Former-commit-id: e3409fc614 [formerly 6e033f7043] [formerly ed881aecf24caceed39537661892630d05de175a [formerly 2f43572682]]
Former-commit-id: 9cdf13b03dd10794f11ee92ec922427e3c639f2b [formerly 9adb0360ff]
Former-commit-id: 0bcb68fe59
 2012-10-01 13:11:01 -05:00
Ben Steffensmeier
441bffac99 Issue #189 Make Derived parameters spatially aware 
Former-commit-id: f57e004fc5 [formerly 02ee622165] [formerly 317696c66f] [formerly f57e004fc5 [formerly 02ee622165] [formerly 317696c66f] [formerly 8682b30383 [formerly 317696c66f [formerly f7919f7bfc3f631cc76e19710ea18feb6faf35f9]]]]
Former-commit-id: 8682b30383
Former-commit-id: 3f98be967a [formerly f01d6242ce] [formerly 19601cf5cbe3213be0da76f1f1c451ce0879beaf [formerly 2f6b9f6188]]
Former-commit-id: 4c8d1fddcbc3e00ca179c77760588f8757d68bbd [formerly c866f23a03]
Former-commit-id: 0b0db88d15
 2012-09-27 17:01:32 -05:00
Ben Steffensmeier
696c4400a9 Issue #189 conversion of vb to use grid correctly. 
Former-commit-id: 15f284ac89 [formerly a0fd9c1fbf] [formerly ee36e85848] [formerly 15f284ac89 [formerly a0fd9c1fbf] [formerly ee36e85848] [formerly 393f087340 [formerly ee36e85848 [formerly b47ccc0e899e6067f6c827f5637bb250aa186d7c]]]]
Former-commit-id: 393f087340
Former-commit-id: 8de76a1f0c [formerly 04c99e842f] [formerly d9a033c3335f5a669789916e1922c8823b4a320e [formerly 7d9d3931b4]]
Former-commit-id: 4a5d5ba4b0ad3b7feabd462b8393538dc2df5106 [formerly d9fb077943]
Former-commit-id: 35677ab26c
 2012-09-25 15:05:46 -05:00
Ben Steffensmeier
2dbe64ff64 Issue #189 migrate d2d graph adapters to grid. 
Former-commit-id: a7f4e39a4a [formerly 68877e66b2] [formerly 25d99f66f9] [formerly a7f4e39a4a [formerly 68877e66b2] [formerly 25d99f66f9] [formerly c2c32dd382 [formerly 25d99f66f9 [formerly 6ffd19010837d81bf548863144f4c525ed332a7c]]]]
Former-commit-id: c2c32dd382
Former-commit-id: f3eb360413 [formerly b724fc9358] [formerly 6e8facbab6d9071e893b9b550c0626cad65deea4 [formerly ebf50d6e46]]
Former-commit-id: 3316ec6132dda6d0aaf69742bf23237378a3316e [formerly dd0bb54b5b]
Former-commit-id: b4c8a4e166
 2012-09-25 13:19:17 -05:00
Ben Steffensmeier
2be6128151 Issue #189 convert viz/d2d displays from grib to grid. 
Former-commit-id: 54767956bc [formerly 8e5b20236d] [formerly 9632663c0a] [formerly 54767956bc [formerly 8e5b20236d] [formerly 9632663c0a] [formerly f918b6636f [formerly 9632663c0a [formerly 003825d9634299773ad96843cc82d56ded8a1391]]]]
Former-commit-id: f918b6636f
Former-commit-id: ecdef95d0a [formerly 9512238d6e] [formerly 7490d8b24afa2934ebd15d8ff27aa170ba918366 [formerly 6c38e6abb2]]
Former-commit-id: c681a18cb95fad2c1f4c02dc98365a32a2b66a40 [formerly 769e28c28d]
Former-commit-id: 231ab11d9a
 2012-09-24 14:05:22 -05:00
Ben Steffensmeier
d418d8c7bc Issue #189 convert grib decoder to produce both grib and grid records. 
Change-Id: I12ea0a06f9ce941d77f5a4c0b2d7617f07550640

Former-commit-id: 69283c27a8 [formerly 5f787b6a6b] [formerly 4be2aa88c7] [formerly 69283c27a8 [formerly 5f787b6a6b] [formerly 4be2aa88c7] [formerly 0132d35871 [formerly 4be2aa88c7 [formerly 20f41b849a468c968e866fc84ec9e50c13773f2b]]]]
Former-commit-id: 0132d35871
Former-commit-id: 263cfe59f4 [formerly d1c3a0c1eb] [formerly 6b333c59dfdca8b278d838cd1ed91e9d23e9ae87 [formerly 174d8ad029]]
Former-commit-id: 7dc1a53eb5c14b2a4f3a69bbdfcd21cb9ea1c4b6 [formerly 90dc005f25]
Former-commit-id: 3b6a1ac6a9
 2012-09-20 12:24:35 -05:00
Ben Steffensmeier
f13ba32307 Issue #189 checkin of gridcoverage plugin and switch existing grib to use new plugin 
Change-Id: I060f13ce68e7947e54d62d25d90ebdad2666bece

Former-commit-id: 9eecab65c0 [formerly 4fe2127bfb] [formerly bd8eb7fc15] [formerly 9eecab65c0 [formerly 4fe2127bfb] [formerly bd8eb7fc15] [formerly 05849f634d [formerly bd8eb7fc15 [formerly 8f164a7b948e462b14caf6576de2b898a9a4e880]]]]
Former-commit-id: 05849f634d
Former-commit-id: 6af74b843c [formerly 6b058ace34] [formerly 28ed264c21455f309a74a270145d56d9aa7064df [formerly b547d9dd8f]]
Former-commit-id: f3894ca9c56c5ba2f1f317fbf84aa3eceec77726 [formerly a28984c40c]
Former-commit-id: 9509d72ef9
 2012-09-18 15:19:05 -05:00
Steve Harris
ed04125cd7 12.10.1-4 baseline 
Former-commit-id: 0d8d18d7e2 [formerly e38e81ab8c] [formerly fd19ca5624] [formerly 0d8d18d7e2 [formerly e38e81ab8c] [formerly fd19ca5624] [formerly 49c3861597 [formerly fd19ca5624 [formerly 56e6f8927c92cd546e5fb7a01ad2f19add91f6ed]]]]
Former-commit-id: 49c3861597
Former-commit-id: 424c32bd5d [formerly 684feb34e5] [formerly 26cccfeea72d00040b6ff379b12158bba9f339d2 [formerly 2ba58a3576]]
Former-commit-id: 8c6c58e31355710e22a13ff534f4c47d0ed7d0b0 [formerly 26b7d083ec]
Former-commit-id: e57e7237a9
 2012-09-13 12:08:11 -05:00
Steve Harris
7a4eb9bf41 12.10.1-3 baseline (better than previous which was missing changeset 7d75620) 
Former-commit-id: bbc20f4a68 [formerly 22dac5c82e] [formerly 077ced354e] [formerly bbc20f4a68 [formerly 22dac5c82e] [formerly 077ced354e] [formerly fd5e214e72 [formerly 077ced354e [formerly af8ffe73c81cd980843f137800f9fbb453c9e2c0]]]]
Former-commit-id: fd5e214e72
Former-commit-id: 11421048fb [formerly 9f3bd0d4ec] [formerly bdf8cbe13f96fe312d8ad014285d113e04c8d85a [formerly ba25027ea5]]
Former-commit-id: 669f728964989299c9646d57fbe148142a246f5f [formerly 2002a7cb8d]
Former-commit-id: 6ce314ca65
 2012-09-12 13:10:36 -05:00
Steve Harris
9d4e230e7a 12.10.1-3 baseline 
Former-commit-id: 0403e7d0a9 [formerly de1639aea2] [formerly 21f430062b] [formerly 0403e7d0a9 [formerly de1639aea2] [formerly 21f430062b] [formerly 969e7e6dfd [formerly 21f430062b [formerly 1a94c1ca3674c8e4dbb8847de5190efe33da371c]]]]
Former-commit-id: 969e7e6dfd
Former-commit-id: 64699fa90b [formerly f376a4b4db] [formerly fcb66f8bc7809d9eb8a7989d2e1acbdbe19fb78e [formerly 438d139fdd]]
Former-commit-id: 477c548d5650883749d49288002c87221b218db7 [formerly faadb51529]
Former-commit-id: 5030894212
 2012-09-11 16:00:38 -05:00
Steve Harris
4ccea19158 12.10.1-2 baseline 
Former-commit-id: bb190a66a1 [formerly dde1f4c54d] [formerly 250f0ccac9] [formerly bb190a66a1 [formerly dde1f4c54d] [formerly 250f0ccac9] [formerly a66f3f4b60 [formerly 250f0ccac9 [formerly 3dab4c2eb757ceea21f4db5bb78e8b92767dd18c]]]]
Former-commit-id: a66f3f4b60
Former-commit-id: 406bde9fd0 [formerly ec74f638e5] [formerly f7762df316c068a0c6bb3ef9e303f7dbe3b9cd4a [formerly 34d2ddee9d]]
Former-commit-id: c8612b01cf2efa0937102321eb6c14dfe7097005 [formerly cc3c3dadee]
Former-commit-id: 5684a84a46
 2012-09-11 15:50:57 -05:00
Steve Harris
bc97cf788a 12.10.1-1 baseline 
Former-commit-id: 7248f8b762 [formerly 0abf64b77c] [formerly 195158c004] [formerly 7248f8b762 [formerly 0abf64b77c] [formerly 195158c004] [formerly d708932029 [formerly 195158c004 [formerly 7d17407c5b0a4a3f9b4b083891a5a5975c645810]]]]
Former-commit-id: d708932029
Former-commit-id: 9f4fa7bf83 [formerly e720b8ed31] [formerly eb876c43cf6e8b687c0e099c754e050f9cb32001 [formerly 7bd9c63dc7]]
Former-commit-id: 93d844e1d6c245b4e49c2fcb70d3a7143c1fc5c2 [formerly d65f35ffe9]
Former-commit-id: a924a8347a
 2012-09-04 12:07:27 -05:00
Steve Harris
e38cbf019b 12.9.1-12 baseline 
Former-commit-id: 6784576fc9 [formerly 4bf4f0043a] [formerly 948766c387] [formerly 6784576fc9 [formerly 4bf4f0043a] [formerly 948766c387] [formerly 150bc967a5 [formerly 948766c387 [formerly 09035ea929c2e926b2dce13429c29d3fd3707880]]]]
Former-commit-id: 150bc967a5
Former-commit-id: 15fa63819d [formerly 782941ccc1] [formerly 4e1215512187f5bc2d7c34ebc42a2aad34e0131f [formerly 9311c1737e]]
Former-commit-id: 636b0752d8e9909d3f1d52f3fb2dd51e26dcd63d [formerly 38aa573545]
Former-commit-id: c1e601dc30
 2012-09-04 11:47:38 -05:00
Steve Harris
aec9addbfc 12.9.1-11 baseline 
Former-commit-id: a2bb1dabe0 [formerly d07c18918d] [formerly 6eb6b0909b] [formerly a2bb1dabe0 [formerly d07c18918d] [formerly 6eb6b0909b] [formerly fc405efab7 [formerly 6eb6b0909b [formerly 046d9078b7aa87ff8df98142556713fe38d95c63]]]]
Former-commit-id: fc405efab7
Former-commit-id: 503b7bf15c [formerly dc5ec3d16d] [formerly aa38e16cc24dec9189539c27650c276ab78f3c78 [formerly a14374fcd4]]
Former-commit-id: eee5809bc6e00f9fe11f73224bc731077cdb1b5b [formerly f401755cde]
Former-commit-id: 982804ee0e
 2012-08-30 14:36:12 -05:00
Steve Harris
cba4faf995 12.9.1-10 baseline 
Former-commit-id: 264d870cbf [formerly bdb45cdfae] [formerly 3adc50a783] [formerly 264d870cbf [formerly bdb45cdfae] [formerly 3adc50a783] [formerly cb9b80f3a0 [formerly 3adc50a783 [formerly 32048810bc091d7ba09a321c36cd5a78b2d4bd39]]]]
Former-commit-id: cb9b80f3a0
Former-commit-id: c704490769 [formerly f43a5af47f] [formerly eed64ebc552063bbc01aefdaa691a9c27ae700c3 [formerly dc08c5a71a]]
Former-commit-id: 8b8bb30a759783a20d278f5fb0049d2db76cb8dc [formerly 5bb474d33c]
Former-commit-id: ede38c4b3f
 2012-08-30 14:28:27 -05:00
Steve Harris
98059f9ef1 12.9.1-5 baseline 
Former-commit-id: 77cbd6c1e5 [formerly a1d931fd44] [formerly 61f269f54c] [formerly 77cbd6c1e5 [formerly a1d931fd44] [formerly 61f269f54c] [formerly f2fac39428 [formerly 61f269f54c [formerly d85b989f77196d20eb2d2a21cf4daa13d50474ae]]]]
Former-commit-id: f2fac39428
Former-commit-id: d9faed979f [formerly 7fb0b17bd5] [formerly 54140b7733222bbc423315196e9781453b12f896 [formerly 72824561cb]]
Former-commit-id: 84e9e52a92ae5e740b0daf680a98316f7435f7f7 [formerly 9b5c2094ed]
Former-commit-id: 2d928d328e
 2012-08-21 15:27:03 -05:00
Steve Harris
867586657b 12.9.1-4 baseline 
Former-commit-id: 71b024e3a1 [formerly 36c108e960] [formerly dcda3a2290] [formerly 71b024e3a1 [formerly 36c108e960] [formerly dcda3a2290] [formerly 33b95fb96d [formerly dcda3a2290 [formerly df38541c9df38c634626ae214f288b606004a768]]]]
Former-commit-id: 33b95fb96d
Former-commit-id: 80655bf0a3 [formerly d7d60cc623] [formerly a0362f7c21fdffcde34416e960bbba970227a95e [formerly 9990bf909b]]
Former-commit-id: e06a87e5baa81edcd3ffe2ce62e1eb2416c1ee57 [formerly de9b64b501]
Former-commit-id: 7e1d1f6e08
 2012-08-15 15:19:10 -05:00
Steve Harris
d7acb65c06 12.9.1-3 baseline 
Former-commit-id: 8083b81729 [formerly c11f7d396e] [formerly 36d80b1f60] [formerly 8083b81729 [formerly c11f7d396e] [formerly 36d80b1f60] [formerly 84bbf2573e [formerly 36d80b1f60 [formerly 8e8d15d59bddec475b41e963da4ad0ad5b2c7e86]]]]
Former-commit-id: 84bbf2573e
Former-commit-id: 988563a4b6 [formerly a535b51eba] [formerly 04e06d54a9ad687da3d26555122e216b3426fb97 [formerly edbbacfa8a]]
Former-commit-id: 60681d51155fd0d8fea0ced04f4dc5174712adca [formerly 8c5c5ad6eb]
Former-commit-id: 03bb51ed0e
 2012-08-15 14:26:10 -05:00
Steve Harris
8c620ce4dd 12.9.1-2 baseline 
Former-commit-id: ecba93c959 [formerly 27871051e3] [formerly d1d877d319] [formerly ecba93c959 [formerly 27871051e3] [formerly d1d877d319] [formerly a198b3a807 [formerly d1d877d319 [formerly 4d7a2d3ad046df5dabf1a2ec6c24a37f8bbdc2d2]]]]
Former-commit-id: a198b3a807
Former-commit-id: 8690f264b6 [formerly de4c812834] [formerly db9021d4da0353e03ade3f0d5a5eae88fce61247 [formerly 448ed038c2]]
Former-commit-id: 007434bc5f036c2f1f728feff774f4546fd4a8a5 [formerly ed416f241e]
Former-commit-id: adf346e7d3
 2012-08-15 14:12:24 -05:00
Steve Harris
31353e2296 12.9.1-1 baseline 
Former-commit-id: b9fb1c89d4 [formerly 8309193ce9] [formerly 31ae7ea218] [formerly b9fb1c89d4 [formerly 8309193ce9] [formerly 31ae7ea218] [formerly 79ce6cfd97 [formerly 31ae7ea218 [formerly 6601ddb09c2928754c2c3859dac284998d73ff81]]]]
Former-commit-id: 79ce6cfd97
Former-commit-id: d3023f15ac [formerly aed7a644df] [formerly b452006db8c662d7b75e89f5dcc158103aa65a9b [formerly 0c5d9e2416]]
Former-commit-id: b1b11fe00755e632d56330d48d6e1eee387eeef8 [formerly 63bcadf121]
Former-commit-id: 16d7d955fc
 2012-08-15 13:59:00 -05:00
Steve Harris
5b36559525 12.8.1-10 baseline 
Former-commit-id: 79d4d91e46 [formerly 6244359a80] [formerly b5e8fee24d] [formerly 79d4d91e46 [formerly 6244359a80] [formerly b5e8fee24d] [formerly ca25d508ec [formerly b5e8fee24d [formerly 7c799ab7b99993c77b6568529b46aaf13d01300b]]]]
Former-commit-id: ca25d508ec
Former-commit-id: 330df3323f [formerly 78d34d65d2] [formerly ecf87b1305ff66ff4fdee1eb082f70a1ea1b736b [formerly d5563fc340]]
Former-commit-id: ec8b3d9f8a4ff2a546518a3c5769751ec3bf2a2f [formerly 46daa48f1c]
Former-commit-id: 78d66ba6df
 2012-08-06 09:34:26 -05:00
Steve Harris
1098368e19 12.8.1-5 baseline 
Former-commit-id: 2e804fc8c4 [formerly 2653ddc2e3] [formerly fd2abfb6f1] [formerly 2e804fc8c4 [formerly 2653ddc2e3] [formerly fd2abfb6f1] [formerly cd49ef3eda [formerly fd2abfb6f1 [formerly 99fb675cc2e1b94825ccda1fe09b1be0c3c25b3f]]]]
Former-commit-id: cd49ef3eda
Former-commit-id: 4f47148ced [formerly dab00b12e6] [formerly 470040dd3334156744a98f7368531647893ed93d [formerly e0c3722fd1]]
Former-commit-id: 573a0cc46f2d0efe2e8514f12ca675b4673c9160 [formerly e86949a8d3]
Former-commit-id: d3be09bd74
 2012-08-01 10:45:37 -05:00
Steve Harris
23dc8deeb0 12.7.1-8 baseline 
Former-commit-id: b242dd98d6 [formerly 11f96dbedd] [formerly 16bf591a33] [formerly b242dd98d6 [formerly 11f96dbedd] [formerly 16bf591a33] [formerly c42ae0fa39 [formerly 16bf591a33 [formerly 46767a18a0d6e1f2182720c8a04c6e1e59cb18a1]]]]
Former-commit-id: c42ae0fa39
Former-commit-id: e1eb7f5972 [formerly f2102bfb24] [formerly 02bef853ef7c7fae6630b12e89ad4d9ef11bc391 [formerly 9f97182964]]
Former-commit-id: 8c3889c2ea3f00fe58aa1f356c175dee2c28f99c [formerly 9aabe438b9]
Former-commit-id: 36e2ad3023
 2012-07-19 16:20:40 -05:00
Steve Harris
c74431ba29 12.6.1-9 baseline 
Former-commit-id: 32fdf6ed3b [formerly 7c064b6868] [formerly 2c0ff851ca] [formerly 32fdf6ed3b [formerly 7c064b6868] [formerly 2c0ff851ca] [formerly 27afa60345 [formerly 2c0ff851ca [formerly 8f93efb93ec2d244fe599c16b3af5b33784c0232]]]]
Former-commit-id: 27afa60345
Former-commit-id: e528bb0df2 [formerly dc50bc8443] [formerly 39c28d347eb5aeecbc48481fe6871268a89c0c2d [formerly 4f7bb90bb0]]
Former-commit-id: 38b944b7b39fc0e1e6c5f5e0171cfa20b64068e4 [formerly d5fa61041b]
Former-commit-id: 37f2b6e138
 2012-07-10 07:53:49 -05:00
Steve Harris
46068c6716 12.5.1-15 baseline 
Former-commit-id: 2f10c7a1e4 [formerly 8552902906] [formerly b13cbb7e00] [formerly 2f10c7a1e4 [formerly 8552902906] [formerly b13cbb7e00] [formerly 3904c4ccf5 [formerly b13cbb7e00 [formerly 4909e0dd166e43c22a34d96aa744f51db8a7d6c0]]]]
Former-commit-id: 3904c4ccf5
Former-commit-id: 1f521a70b3 [formerly 97c4db937e] [formerly 0e40eb424698bf43c230ac21347627590405fcb2 [formerly 676ea3192f]]
Former-commit-id: 5dd364497cd5da1357297a4b842e962ad3d5e006 [formerly 9054c5ab6c]
Former-commit-id: 39ff9954f8
 2012-06-08 13:39:48 -05:00
Max Schenkelberg
50caaa47a4 Issue #358 Fixed merge errors when merging core_exp into ss_sync 
Former-commit-id: e0a22310dc [formerly 2ef208b263] [formerly 3fe183277b] [formerly e0a22310dc [formerly 2ef208b263] [formerly 3fe183277b] [formerly e3d6962fe6 [formerly 3fe183277b [formerly e8846fa2b5aa1ef2972f134a683246bc275a8067]]]]
Former-commit-id: e3d6962fe6
Former-commit-id: c5b45b0265 [formerly 338f80fa87] [formerly b0a578678016a097651cd359f6c7d0ad3223db18 [formerly 878de45ee6]]
Former-commit-id: 9ffb2ad0cd59863353c63a130f22384e8bd16572 [formerly 9f72069996]
Former-commit-id: 4ddcccc3c7
 2012-05-01 18:36:09 -05:00
Steve Harris
3419f72215 Merge branch 'core_exp' into ss_sync (Graphics Improvements for NPP/Collaboration) 
used git cherry-pick -m 1 879a2e0

Initial reconciliation of Graphics Improvements for NPP/Collaboration with 12.3.1 baseline

Conflicts:
	cave/com.raytheon.uf.viz.derivparam/src/com/raytheon/uf/viz/derivparam/tree/DerivedLevelNode.java*
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/AbstractGLMesh.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLCanvasCache.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLFactoryAdapter.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLGeometryPainter.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/IGLTarget.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/AbstractGLImage.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLCMTextureData.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLColormappedImage.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLImage.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLTarget.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLWireframeShape2D.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/objects/GLVertexBufferObject.java
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/util/GribDataCubeAdapter.java
	cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/drawables/GeneralPointImageExtension.java
	cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/drawables/IPointImageExtension.java
	cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/rsc/PlotResource2.java*
	cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/mosaic/ext/IRadarMosaicImageExtension.java
	edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/msgs/GetServerTimeRequest.java

Conflicts:

	ncep/gov.noaa.nws.ncep.viz.rsc.mosaic/src/gov/noaa/nws/ncep/viz/rsc/mosaic/rsc/RadarRadialResource.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ncradar/src/gov/noaa/nws/ncep/viz/rsc/ncradar/rsc/RadarImageResource.java


Former-commit-id: fe946166ed [formerly 4ec294b525] [formerly 2ed7249613] [formerly fe946166ed [formerly 4ec294b525] [formerly 2ed7249613] [formerly 7b75b781ad [formerly 2ed7249613 [formerly 05d9729acfe9e0f4af4a6ec030052ab26b0a5eb9]]]]
Former-commit-id: 7b75b781ad
Former-commit-id: 3992b18e28 [formerly 7c7fc97131] [formerly 228c26d32b0b13d4cccf51b188ca617ec417aba4 [formerly 6dd3ee8809]]
Former-commit-id: 7a3a10e1ab59cf68f5e1476abff39883afb9ef4b [formerly fd9e226b35]
Former-commit-id: 491aa53a0c
 2012-05-01 18:31:09 -05:00
Steve Harris
7f90924706 12.4.1-10 baseline 
Former-commit-id: 7fa9dbd5fb [formerly 4bfbdad17d] [formerly 9f8cb727a5] [formerly 7fa9dbd5fb [formerly 4bfbdad17d] [formerly 9f8cb727a5] [formerly 8485b90ff8 [formerly 9f8cb727a5 [formerly bf53d06834caa780226121334ac1bcf0534c3f16]]]]
Former-commit-id: 8485b90ff8
Former-commit-id: 40aa780b3d [formerly 33a67cdd82] [formerly 73930fb29d0c1e91204e76e6ebfdbe757414f319 [formerly a28d70b5c5]]
Former-commit-id: a16a1b4dd44fc344ee709abbe262aeed58a8339b [formerly e5543a0e86]
Former-commit-id: 0c25458510
 2012-05-01 18:06:13 -05:00
Max Schenkelberg
f0a90ad028 Issue #358 Fixed merge errors when merging core_exp into ss_sync 
Former-commit-id: 9126809973 [formerly e03ee60c75] [formerly 1294fa0ca1] [formerly 9126809973 [formerly e03ee60c75] [formerly 1294fa0ca1] [formerly 90a5c20b5a [formerly 1294fa0ca1 [formerly bd93246cccd1b123598006d7343eac265392695d]]]]
Former-commit-id: 90a5c20b5a
Former-commit-id: 937f4b6aa3 [formerly 51a826384e] [formerly 2e1507a1308f6373329e72eb1d9ccc52bd416fb3 [formerly 65c864aff2]]
Former-commit-id: 7d5e1d641386de98262499c8ba677d6c85554bf1 [formerly 72a27b7ae0]
Former-commit-id: 33d08f1496
 2012-04-19 11:11:34 -05:00
Steve Harris
0cf19dc505 Merge branch 'core_exp' into ss_sync (Graphics Improvements for NPP/Collaboration) 
Initial reconciliation of Graphics Improvements for NPP/Collaboration with 12.3.1 baseline

Conflicts:
	cave/com.raytheon.uf.viz.derivparam/src/com/raytheon/uf/viz/derivparam/tree/DerivedLevelNode.java*
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/AbstractGLMesh.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLCanvasCache.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLFactoryAdapter.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLGeometryPainter.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/IGLTarget.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/AbstractGLImage.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLCMTextureData.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLColormappedImage.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLImage.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLTarget.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLWireframeShape2D.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/objects/GLVertexBufferObject.java
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/util/GribDataCubeAdapter.java
	cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/drawables/GeneralPointImageExtension.java
	cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/drawables/IPointImageExtension.java
	cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/rsc/PlotResource2.java*
	cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/mosaic/ext/IRadarMosaicImageExtension.java
	edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/msgs/GetServerTimeRequest.java

Former-commit-id: 634d40a156 [formerly 63f11892e8] [formerly 4d7572a632] [formerly 634d40a156 [formerly 63f11892e8] [formerly 4d7572a632] [formerly 625cd4262c [formerly 4d7572a632 [formerly 5e1b9319941eed516a08a135a2049c14bad77863]]]]
Former-commit-id: 625cd4262c
Former-commit-id: 6aa0898aae [formerly e86dc647be] [formerly f6efcfd8ee5a2a4ca8ad3ed217945853b75bfa5f [formerly def458753d]]
Former-commit-id: 8ce2584572b74cd38fac4b323558490c8c29e686 [formerly 19657ae52d]
Former-commit-id: 9b8c6e395d
 2012-04-19 11:11:02 -05:00
Steve Harris
5b35d8a6e0 12.4.1-4 baseline 
Former-commit-id: 4767b0e069 [formerly 750b7543dd] [formerly 67a5a68300] [formerly 4767b0e069 [formerly 750b7543dd] [formerly 67a5a68300] [formerly 2a216f333c [formerly 67a5a68300 [formerly ad648deaf4d3edaabdda15184289b3a927308bd7]]]]
Former-commit-id: 2a216f333c
Former-commit-id: 98d8b3f188 [formerly a2a6a18fae] [formerly e8514db31c64b82122112f0e87cbbf3cda2d8c2b [formerly a4e519f3cd]]
Former-commit-id: 816045b74a6ddb3791f4e241a6f25a4d4ab3391a [formerly 8cd5974f4c]
Former-commit-id: 74b66d9683
 2012-04-18 15:18:16 -05:00
Max Schenkelberg
d25bbaaea2 Issue #358 Fixed merge errors when merging core_exp into ss_sync 
Former-commit-id: 25cf44a674 [formerly 74458bfb73] [formerly 9b0d01f8b5] [formerly 25cf44a674 [formerly 74458bfb73] [formerly 9b0d01f8b5] [formerly 07cf5069ba [formerly 9b0d01f8b5 [formerly beb6a1d49fac8e3e7b2ba8cbc52a8980d06e9885]]]]
Former-commit-id: 07cf5069ba
Former-commit-id: ea7fcde242 [formerly 4234b91d5b] [formerly bf3b4f5b4265812c5767225a4547be327787f7dd [formerly 993cac891e]]
Former-commit-id: 28b91cc7176d4b78395f3f59578f0b975773db53 [formerly f20e674318]
Former-commit-id: e8bc0cfa66
 2012-03-30 10:51:31 -05:00
Steve Harris
095b190063 Merge branch 'core_exp' into ss_sync (Graphics Improvements for NPP/Collaboration) 
Initial reconciliation of Graphics Improvements for NPP/Collaboration with 12.3.1 baseline

Conflicts:
	cave/com.raytheon.uf.viz.derivparam/src/com/raytheon/uf/viz/derivparam/tree/DerivedLevelNode.java*
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/AbstractGLMesh.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLCanvasCache.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLFactoryAdapter.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLGeometryPainter.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/IGLTarget.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/AbstractGLImage.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLCMTextureData.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLColormappedImage.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLImage.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLTarget.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLWireframeShape2D.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/objects/GLVertexBufferObject.java
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/util/GribDataCubeAdapter.java
	cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/drawables/GeneralPointImageExtension.java
	cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/drawables/IPointImageExtension.java
	cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/rsc/PlotResource2.java*
	cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/mosaic/ext/IRadarMosaicImageExtension.java
	edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/msgs/GetServerTimeRequest.java

Former-commit-id: b4846ce8a8 [formerly a4e4792bb5] [formerly d3ad6095b7] [formerly b4846ce8a8 [formerly a4e4792bb5] [formerly d3ad6095b7] [formerly 5cdda77afb [formerly d3ad6095b7 [formerly 879a2e0a4a31999bf4d624ff59e77bbd68195458]]]]
Former-commit-id: 5cdda77afb
Former-commit-id: c6071e24c5 [formerly 9845ef53f9] [formerly a5d7cad4cf9dcde7d77f5ce8ca8a3ccca2fdde58 [formerly 6aa18f74f6]]
Former-commit-id: 863dd9f649ac647186ce86d3db6a31c7237682d4 [formerly 9fee09c9e4]
Former-commit-id: 1556e72eeb
 2012-03-30 09:50:48 -05:00
Steve Harris
9340618732 12.3.1-10 baseline 
Former-commit-id: 760ead2047 [formerly 0e4128712b] [formerly 4068f5295f] [formerly 760ead2047 [formerly 0e4128712b] [formerly 4068f5295f] [formerly 22bd792cd9 [formerly 4068f5295f [formerly 7d62bca046401a670ef7bd917cbcbb073e061b60]]]]
Former-commit-id: 22bd792cd9
Former-commit-id: 11e448aa39 [formerly 8bc60b1e32] [formerly b700b47e15bf8e3b38455fe3bf3c827edd272477 [formerly ce3b74c605]]
Former-commit-id: cdb2bb52e23fe42c5a5b48dfdf59046836f2f615 [formerly 2e0f4b241b]
Former-commit-id: 293563cfe7
 2012-03-30 08:38:33 -05:00
Steve Harris
8850e44772 Merge branch 'sync_test' (VCModules) into ss_sync 
Former-commit-id: b05701d2d7 [formerly 0665862abe] [formerly 70357d90bc] [formerly b05701d2d7 [formerly 0665862abe] [formerly 70357d90bc] [formerly a0abcf8120 [formerly 70357d90bc [formerly e68338cecbe85a62835633e9aba0925344fb80f1]]]]
Former-commit-id: a0abcf8120
Former-commit-id: 239813406d [formerly 65aa72fee7] [formerly 7c1f75dd0fbc3e3a61f9128ed10a9a9c268a43da [formerly 6884520750]]
Former-commit-id: 5a694628c15cf0ff0b617182e7f4ca869e47cb8d [formerly 5a310acb18]
Former-commit-id: 0a7cb5fd7a
 2012-03-29 10:03:05 -05:00
Max Schenkelberg
e6fcc458e5 Issue #358 Made wireframe shapes rely more on the grid geoemtry of the 
descriptor than the actual descriptor as the descriptor is used purely
for convenience 

Former-commit-id: 86d3763df0 [formerly 66eaffb9ee] [formerly 15a9245592] [formerly 86d3763df0 [formerly 66eaffb9ee] [formerly 15a9245592] [formerly f10f1a5319 [formerly 15a9245592 [formerly 265ccb3e22aa0122dbd74e83d0af202596c1941c]]]]
Former-commit-id: f10f1a5319
Former-commit-id: 5fc757226e [formerly bbab188fb9] [formerly 6d1ea66ba9a1390c296443e20785aa9ef4a890fa [formerly ac11dd0c18]]
Former-commit-id: cb1bc79da744506da785204d429e696d9676fb32 [formerly 2f3b9f0067]
Former-commit-id: e73e40dc78
 2012-03-28 13:32:04 -05:00
Max Schenkelberg
5706cf4610 Issue #422 Set "numericValue" to null in RadarDefaultInterrogator in 
case of "NO DATA"

Former-commit-id: a0663a2791 [formerly 468c812dde] [formerly cd6ebd80d4] [formerly a0663a2791 [formerly 468c812dde] [formerly cd6ebd80d4] [formerly b9085db25d [formerly cd6ebd80d4 [formerly 89521a4df36d18ecb64b4cce248f150f0a0e4957]]]]
Former-commit-id: b9085db25d
Former-commit-id: 13f08a98a9 [formerly 81bc45f071] [formerly 46b9ad1c87f0e0eaf7fe167226e5b9dfa00844ed [formerly 954073b38c]]
Former-commit-id: d43b048af219f6ced6cf70ae84cf53f92bf3cae7 [formerly 645900727c]
Former-commit-id: 8878a9732d
 2012-03-16 10:13:31 -05:00
Max Schenkelberg
893bc3d143 Issue #358 Fixed sampling issue with mosaic resource with best 
res resources

Former-commit-id: 1b8beb3f8d [formerly 97edff9f7c] [formerly cc111ab9ac] [formerly 1b8beb3f8d [formerly 97edff9f7c] [formerly cc111ab9ac] [formerly 258d57e825 [formerly cc111ab9ac [formerly 8aaf5e65d7c8ecbced6252d4a98af6223c77d5a0]]]]
Former-commit-id: 258d57e825
Former-commit-id: 712815ee18 [formerly 4e81d2432c] [formerly 6ca4a7d453c44b2e3a855ba1e88fd28485927549 [formerly 1e5c074e3b]]
Former-commit-id: 98df734d7d4b6cec5aaffaedd02aad173354c879 [formerly a3bda1957c]
Former-commit-id: e220ddf515
 2012-03-16 09:03:50 -05:00
Max Schenkelberg
6b7a3c0976 Issue #358 Fixed painting and sampling regression in radar mosaic due to 
core improvements from NPP in GL mosaic imaging extension and discovered
while testing IMesh improvements

Former-commit-id: 732c2ddb5c [formerly 10b720381b] [formerly 719f87c261] [formerly 732c2ddb5c [formerly 10b720381b] [formerly 719f87c261] [formerly 556a270a09 [formerly 719f87c261 [formerly f739d79bfd547adc295c716a1804f55f09b1bde1]]]]
Former-commit-id: 556a270a09
Former-commit-id: f51a9e5571 [formerly a4b859ae54] [formerly c943e46db5cb54b3fb026d1fe63057721df3c99d [formerly ba8af4dcc1]]
Former-commit-id: 0c6e6c289a70731ede2efaff64d0abccd158358b [formerly 682aca1dda]
Former-commit-id: d585d19f48
 2012-03-14 18:03:44 -05:00
Max Schenkelberg
42696fd296 Issue #358 Cleaned up mesh extension and API to use geotools for 
defining a mesh.  This is better practice than using arbitrary
MathTransform objects as it is well defined and allows for serialization
of the mesh to occur.

Former-commit-id: 5a61f3ae23 [formerly 8fb7eccb73] [formerly 6e5964df9d] [formerly 5a61f3ae23 [formerly 8fb7eccb73] [formerly 6e5964df9d] [formerly 50765e8a34 [formerly 6e5964df9d [formerly 7e4abe637edacca71e1e1c98d99521cd33415fb0]]]]
Former-commit-id: 50765e8a34
Former-commit-id: 458f5970aa [formerly 8f08fab0a7] [formerly 87c83af55da8aec24c975aa2f80b06b4449fa969 [formerly cf440b3884]]
Former-commit-id: 732d389245ce92a580088b9302b87702dca2b03d [formerly 6378e8c4ee]
Former-commit-id: 9366a5f308
 2012-03-14 09:49:32 -05:00
Max Schenkelberg
714bb7dfec Issue #358 Merging core drawing API improvements from Collaboration 
Former-commit-id: 3beecc1cdf [formerly 18805c68f7] [formerly d43b0456d8] [formerly 3beecc1cdf [formerly 18805c68f7] [formerly d43b0456d8] [formerly 89f603f448 [formerly d43b0456d8 [formerly a266a93ec2dca3ffbd7d2fd1f9dc47d7e18e6904]]]]
Former-commit-id: 89f603f448
Former-commit-id: 8b6aa63464 [formerly f78b932abb] [formerly 69a2b029e678fdd8a18305144330e4c95774ec78 [formerly 4662ece060]]
Former-commit-id: 633ae123a39ad609c62c4173a428f3bfbc1fedbd [formerly 1303289d12]
Former-commit-id: 0f005d3521
 2012-03-09 12:31:50 -06:00
David Gillingham
65b8db12e8 Issue #354: Refactor AbstractParmManager to better handle ISC parm 
pre-loading.

Former-commit-id: 364b9e19b3 [formerly 1908212c27] [formerly d68e3a7eea] [formerly 364b9e19b3 [formerly 1908212c27] [formerly d68e3a7eea] [formerly 494fbe93db [formerly d68e3a7eea [formerly e2c66b33fd8c71b0da6518c419296ab8141a07e3]]]]
Former-commit-id: 494fbe93db
Former-commit-id: e0987cc993 [formerly 29f03b0d2a] [formerly 22e522451d0eb5f0c7b3b2a357bfc73d015795c9 [formerly bc61eb1e43]]
Former-commit-id: c6da80d0d4984844822b65b3e0c4d22fd8ce459b [formerly ad8efe180e]
Former-commit-id: 678953ae76
 2012-03-05 11:23:11 -06:00
David Gillingham
4ed8de501b Issue #346: Convert GFE to use identity-based ListenerLists, increase 
synchronization in Parm/VCParm to prevent leaking of VCParms through
ListenerLists.

Former-commit-id: 87de9d067b [formerly bd01975367] [formerly f6f0ca24df] [formerly 87de9d067b [formerly bd01975367] [formerly f6f0ca24df] [formerly 0c0f659896 [formerly f6f0ca24df [formerly 5fc74409511903afa97949bc3cd1b3acf91c35e0]]]]
Former-commit-id: 0c0f659896
Former-commit-id: f670f3c950 [formerly bce9ad39ae] [formerly de321dd91cb8346ac092574ed9b7c81299c63edf [formerly b3df043f97]]
Former-commit-id: 26f66133ee05397f66e892ce87225a06441ee4f2 [formerly 788007ff63]
Former-commit-id: 0b79b9ea21
 2012-03-02 13:22:46 -06:00
Max Schenkelberg
67b1edb767 Issue #358 Committing NPP core rendering improvements merged with Thin 
Client core improvements

Former-commit-id: fe1811c167 [formerly e2cd95d3f4] [formerly ae47d9683e] [formerly fe1811c167 [formerly e2cd95d3f4] [formerly ae47d9683e] [formerly 48b6d45f00 [formerly ae47d9683e [formerly 206bd0450140b6bcdb3ec8f1e1e417c4c37746d6]]]]
Former-commit-id: 48b6d45f00
Former-commit-id: 52c7dec2e8 [formerly 0554abdde0] [formerly 22d12e35f7b0f5789a9dd62c8684fad371d63859 [formerly 3212cc6ebb]]
Former-commit-id: de90ce0a3f7817cfc15c75089e7f6a081fef0acc [formerly 585e979c76]
Former-commit-id: ae389f0b57
 2012-03-01 16:59:40 -06:00
Steve Harris
4ee0ec25ea Merge branch 'ss_sync' into sync_test 
Former-commit-id: 994e79cfb3 [formerly 3b9c3e3474] [formerly 951ecfe3dd] [formerly 994e79cfb3 [formerly 3b9c3e3474] [formerly 951ecfe3dd] [formerly 787aed90f8 [formerly 951ecfe3dd [formerly 7ebcf63686d75d58f8bfea92e825edaf49a30df1]]]]
Former-commit-id: 787aed90f8
Former-commit-id: 6fdae68267 [formerly b3f831a7b4] [formerly 64c60f8d4b42c0f811914474c3baf46e1940786e [formerly db45babec8]]
Former-commit-id: 840d838fc0fb5c246c5a324aa5695ebb80f9cd44 [formerly 376edad3c9]
Former-commit-id: cdc4d1cb44
 2012-03-01 14:01:16 -06:00