Commit graph

237 commits

Author SHA1 Message Date
Ben Steffensmeier
0a31d3649d Issue #189 updates to grid from code review comments
Former-commit-id: 8a5aa9adc9 [formerly 52f7d6d6fa] [formerly 8a5aa9adc9 [formerly 52f7d6d6fa] [formerly aa08ec7929 [formerly 25d6e51d9e748a6e05c93fdff0b641731360bfee]]]
Former-commit-id: aa08ec7929
Former-commit-id: d6b85c32b5 [formerly 8ae8e40f25]
Former-commit-id: 9ba9377361
2012-10-10 16:32:38 -05:00
Ben Steffensmeier
069958385b Issue #189 minor fixes to grid for issues discovered during dev tests
Former-commit-id: fa380d06c1 [formerly 23da6e6494] [formerly fa380d06c1 [formerly 23da6e6494] [formerly 509c09ebb0 [formerly 4ae112f6fcc9c2d0bb8715033a80d265dbdfe8b4]]]
Former-commit-id: 509c09ebb0
Former-commit-id: 4cacd4a7b1 [formerly 59754c0f6a]
Former-commit-id: b3a945b203
2012-10-10 16:32:36 -05:00
Ben Steffensmeier
9ee0ea561e Issue #189 updates to GFE from code review
Former-commit-id: bf80df2927 [formerly 3ff63d4ad3] [formerly bf80df2927 [formerly 3ff63d4ad3] [formerly 8afcbace62 [formerly a64647ddbd4f062602f092b828c080af2550f31a]]]
Former-commit-id: 8afcbace62
Former-commit-id: 4178809218 [formerly c1ee94b3f3]
Former-commit-id: 0c5ed56c2f
2012-10-10 16:32:34 -05:00
Ben Steffensmeier
2ab0828bae Issue #189 update grid resource reprojection to match ss_builds
Former-commit-id: 326acb6c15 [formerly c503a9b94c] [formerly 326acb6c15 [formerly c503a9b94c] [formerly a6168a2e88 [formerly 4a2a57ae5e7b380141910106aa016c6c4ef46d82]]]
Former-commit-id: a6168a2e88
Former-commit-id: 2c82f142ca [formerly 8c21bc8510]
Former-commit-id: ab90613e0b
2012-10-10 16:32:33 -05:00
Ben Steffensmeier
7018e0d77f Issue #189 remove some deprecated grib functionality
Former-commit-id: 589b08c5c2 [formerly 797616c72b] [formerly 589b08c5c2 [formerly 797616c72b] [formerly 6fb6762585 [formerly 25f8bfa8c8739f63e088aee7b3536e28620c6494]]]
Former-commit-id: 6fb6762585
Former-commit-id: 7572fa223e [formerly e4e6b0d037]
Former-commit-id: 5ee9aa83bd
2012-10-10 16:32:31 -05:00
Ben Steffensmeier
83ca215cf8 Issue #189 switch uengine to grid
Former-commit-id: dd0330d68e [formerly fdd63e3c3b] [formerly dd0330d68e [formerly fdd63e3c3b] [formerly 7016f72e88 [formerly 55b665ecc63d591aa4eabb76bca2a623cc0b1a2a]]]
Former-commit-id: 7016f72e88
Former-commit-id: cd13b386c4 [formerly b50c4bd20d]
Former-commit-id: 0c4571f66c
2012-10-01 16:52:48 -05:00
Ben Steffensmeier
d6a1db4257 Issue #189 switch rpg to use grid data.
Former-commit-id: 985a00559b [formerly b702ebdf55] [formerly 985a00559b [formerly b702ebdf55] [formerly b5e4d73010 [formerly 2a166f22d69d2e83dce6f101145b542d8b4144c7]]]
Former-commit-id: b5e4d73010
Former-commit-id: fcf1be0876 [formerly 77cc02e8c8]
Former-commit-id: b916b55dd2
2012-10-01 16:51:53 -05:00
Ben Steffensmeier
061859986b Issue #189 switch ohd to grid.
Former-commit-id: 682b7b8817 [formerly 6879a81436] [formerly 682b7b8817 [formerly 6879a81436] [formerly f34fc897b8 [formerly 6719880dd11c61f7c2ec54b2cede89ad2e3a5774]]]
Former-commit-id: f34fc897b8
Former-commit-id: 1b8eb83696 [formerly db20aec667]
Former-commit-id: 2d17b3d636
2012-10-01 16:33:08 -05:00
Ben Steffensmeier
e2c2abc028 Issue #189 switch FFMP source config to grid.
Former-commit-id: 691753fef2 [formerly 4007fa442b] [formerly 691753fef2 [formerly 4007fa442b] [formerly 0b2121d3af [formerly 85dac537f47cea6cc8ee6b0e0092c80544b6a89a]]]
Former-commit-id: 0b2121d3af
Former-commit-id: b6fd0f6826 [formerly ad8d2a2892]
Former-commit-id: a11605cdbf
2012-10-01 16:10:32 -05:00
Ben Steffensmeier
a41faed68b Issue #189 switch gfe to grid.
Former-commit-id: ddbd05372b [formerly 5cf650b61a] [formerly ddbd05372b [formerly 5cf650b61a] [formerly 4ab3357b8d [formerly 7c029a18dcfd9f955fd3a9a2351d5dfef6d18912]]]
Former-commit-id: 4ab3357b8d
Former-commit-id: 22f5e57dc9 [formerly 18da7f96bd]
Former-commit-id: 0652b5bd8b
2012-10-01 16:08:43 -05:00
Ben Steffensmeier
97533d3341 Issue #189 fix merge issue with derived parameters going from 12.4 to 12.5
Former-commit-id: 7750b6259c [formerly 5fe75cb57f] [formerly 7750b6259c [formerly 5fe75cb57f] [formerly 666fe70a71 [formerly f35c55683ab90289526f500b3bc2b623ded433e5]]]
Former-commit-id: 666fe70a71
Former-commit-id: c8bf67f7fc [formerly fcf5cba055]
Former-commit-id: 12bdf84fbf
2012-10-01 15:41:38 -05:00
Ben Steffensmeier
fff6719c06 Issue #189 switch DAT to grid.
Former-commit-id: c2a12bbfdd [formerly 4d6358ec52] [formerly c2a12bbfdd [formerly 4d6358ec52] [formerly b3190ba34d [formerly a062b80648acb5d7ba664821bb9f65bdf985a971]]]
Former-commit-id: b3190ba34d
Former-commit-id: a7d78f268f [formerly a2b019d655]
Former-commit-id: b7036a34a8
2012-10-01 15:38:53 -05:00
Ben Steffensmeier
d3f7a486e7 Issue #189 convert hydro and hydrocommon to grid.
Former-commit-id: 3e0da6d171 [formerly 8d150d404c] [formerly 3e0da6d171 [formerly 8d150d404c] [formerly 3e93e8980b [formerly a84fcbd045c24c16b30df4328aaf3bbbb30efd17]]]
Former-commit-id: 3e93e8980b
Former-commit-id: 3a1ba7bd87 [formerly 734922cb44]
Former-commit-id: 24e6010646
2012-10-01 14:05:40 -05:00
Ben Steffensmeier
fa5cbdea32 Issue #189 switch GL to use regular floats so it works with very samll values and NaN.
Former-commit-id: 6441db74b0 [formerly b5df6b6ef4] [formerly 6441db74b0 [formerly b5df6b6ef4] [formerly 0a0597302f [formerly f850384883b1faaf3f1092aa2a40cac89b952c5f]]]
Former-commit-id: 0a0597302f
Former-commit-id: a9d7ca9e96 [formerly 3477060b44]
Former-commit-id: 6e7617f611
2012-10-01 13:19:00 -05:00
Ben Steffensmeier
0bcb68fe59 Issue #189 convert sounding/cloudheight to grid.
Former-commit-id: b67376efc9 [formerly 7544986f1f] [formerly b67376efc9 [formerly 7544986f1f] [formerly 7efbc19f81 [formerly 4a95bbc65642b688d67fb67faf8d76aed10d2f7c]]]
Former-commit-id: 7efbc19f81
Former-commit-id: 6e033f7043 [formerly 2f43572682]
Former-commit-id: 9adb0360ff
2012-10-01 13:11:01 -05:00
Ben Steffensmeier
22e8f3bb1a Issue #189 changes from code review comments for gridcoverage.
Former-commit-id: 516742e64a [formerly 94e4f2adb6] [formerly 516742e64a [formerly 94e4f2adb6] [formerly 7f99750ba5 [formerly cfac5882643a0bde47c6f81623dd80ec41604a82]]]
Former-commit-id: 7f99750ba5
Former-commit-id: a6561786fa [formerly 57d35bb700]
Former-commit-id: 8f40c154fb
2012-10-01 12:49:28 -05:00
Ben Steffensmeier
0b0db88d15 Issue #189 Make Derived parameters spatially aware
Former-commit-id: 02ee622165 [formerly 317696c66f] [formerly 02ee622165 [formerly 317696c66f] [formerly 8682b30383 [formerly f7919f7bfc3f631cc76e19710ea18feb6faf35f9]]]
Former-commit-id: 8682b30383
Former-commit-id: f01d6242ce [formerly 2f6b9f6188]
Former-commit-id: c866f23a03
2012-09-27 17:01:32 -05:00
Ben Steffensmeier
35677ab26c Issue #189 conversion of vb to use grid correctly.
Former-commit-id: a0fd9c1fbf [formerly ee36e85848] [formerly a0fd9c1fbf [formerly ee36e85848] [formerly 393f087340 [formerly b47ccc0e899e6067f6c827f5637bb250aa186d7c]]]
Former-commit-id: 393f087340
Former-commit-id: 04c99e842f [formerly 7d9d3931b4]
Former-commit-id: d9fb077943
2012-09-25 15:05:46 -05:00
Ben Steffensmeier
b4c8a4e166 Issue #189 migrate d2d graph adapters to grid.
Former-commit-id: 68877e66b2 [formerly 25d99f66f9] [formerly 68877e66b2 [formerly 25d99f66f9] [formerly c2c32dd382 [formerly 6ffd19010837d81bf548863144f4c525ed332a7c]]]
Former-commit-id: c2c32dd382
Former-commit-id: b724fc9358 [formerly ebf50d6e46]
Former-commit-id: dd0bb54b5b
2012-09-25 13:19:17 -05:00
Ben Steffensmeier
231ab11d9a Issue #189 convert viz/d2d displays from grib to grid.
Former-commit-id: 8e5b20236d [formerly 9632663c0a] [formerly 8e5b20236d [formerly 9632663c0a] [formerly f918b6636f [formerly 003825d9634299773ad96843cc82d56ded8a1391]]]
Former-commit-id: f918b6636f
Former-commit-id: 9512238d6e [formerly 6c38e6abb2]
Former-commit-id: 769e28c28d
2012-09-24 14:05:22 -05:00
Ben Steffensmeier
3b6a1ac6a9 Issue #189 convert grib decoder to produce both grib and grid records.
Change-Id: I12ea0a06f9ce941d77f5a4c0b2d7617f07550640

Former-commit-id: 5f787b6a6b [formerly 4be2aa88c7] [formerly 5f787b6a6b [formerly 4be2aa88c7] [formerly 0132d35871 [formerly 20f41b849a468c968e866fc84ec9e50c13773f2b]]]
Former-commit-id: 0132d35871
Former-commit-id: d1c3a0c1eb [formerly 174d8ad029]
Former-commit-id: 90dc005f25
2012-09-20 12:24:35 -05:00
Ben Steffensmeier
57fa7661b6 Issue #189 checkin of grid dataplugin
Change-Id: I49b57915d90e6f5b347960046fa4c97a27a93375

Former-commit-id: 82b83f6e14 [formerly ccc2ae2108] [formerly 82b83f6e14 [formerly ccc2ae2108] [formerly 9512cca8ea [formerly 0b026f5d9d5d86d464cb0ec2b411a59666939276]]]
Former-commit-id: 9512cca8ea
Former-commit-id: 762915184c [formerly 30d970eb95]
Former-commit-id: 464547754e
2012-09-18 15:19:07 -05:00
Ben Steffensmeier
9509d72ef9 Issue #189 checkin of gridcoverage plugin and switch existing grib to use new plugin
Change-Id: I060f13ce68e7947e54d62d25d90ebdad2666bece

Former-commit-id: 4fe2127bfb [formerly bd8eb7fc15] [formerly 4fe2127bfb [formerly bd8eb7fc15] [formerly 05849f634d [formerly 8f164a7b948e462b14caf6576de2b898a9a4e880]]]
Former-commit-id: 05849f634d
Former-commit-id: 6b058ace34 [formerly b547d9dd8f]
Former-commit-id: a28984c40c
2012-09-18 15:19:05 -05:00
Bryan Kowal
720fd8ea69 Fix the git ignore file
Former-commit-id: c1a0d9556e [formerly 8d8ee30cae] [formerly c1a0d9556e [formerly 8d8ee30cae] [formerly 30190f5055 [formerly 69ac546cca867eddbe6450ebae7e3def2159f33e]]]
Former-commit-id: 30190f5055
Former-commit-id: 5709f478fe [formerly c6bc74a43e]
Former-commit-id: bc15c29c9c
2012-09-14 11:58:12 -05:00
Steve Harris
674c12c0c4 Merge branch 'ss_builds' into Unified_Grid
Former-commit-id: b53075f288 [formerly 206e25cbd4] [formerly b53075f288 [formerly 206e25cbd4] [formerly a821755cf3 [formerly 192e3b583fade6ba3d17be6a3f6248cb11a6a673]]]
Former-commit-id: a821755cf3
Former-commit-id: 107ae12457 [formerly 3a923433e6]
Former-commit-id: cbae0bdbba
2012-09-13 15:26:38 -05:00
Steve Harris
e57e7237a9 12.10.1-4 baseline
Former-commit-id: e38e81ab8c [formerly fd19ca5624] [formerly e38e81ab8c [formerly fd19ca5624] [formerly 49c3861597 [formerly 56e6f8927c92cd546e5fb7a01ad2f19add91f6ed]]]
Former-commit-id: 49c3861597
Former-commit-id: 684feb34e5 [formerly 2ba58a3576]
Former-commit-id: 26b7d083ec
2012-09-13 12:08:11 -05:00
Steve Harris
06755e7055 Merge branch 'Unified_Grid' of ssh://lightning.omaha.us.ray.com:29418/AWIPS2_baseline into Unified_Grid
Former-commit-id: 0a29954879 [formerly 9d04118479] [formerly 0a29954879 [formerly 9d04118479] [formerly cce3b22984 [formerly 96fa74f5ec56b2d3c5682d694f911e1cfbfd4d7c]]]
Former-commit-id: cce3b22984
Former-commit-id: 55fec81a47 [formerly e831a3d5da]
Former-commit-id: 4601f28dcf
2012-09-12 13:14:41 -05:00
Steve Harris
6ce314ca65 12.10.1-3 baseline (better than previous which was missing changeset 7d75620)
Former-commit-id: 22dac5c82e [formerly 077ced354e] [formerly 22dac5c82e [formerly 077ced354e] [formerly fd5e214e72 [formerly af8ffe73c81cd980843f137800f9fbb453c9e2c0]]]
Former-commit-id: fd5e214e72
Former-commit-id: 9f3bd0d4ec [formerly ba25027ea5]
Former-commit-id: 2002a7cb8d
2012-09-12 13:10:36 -05:00
Richard Peter
48f67e89de Merge "Issue #189 initial checkin of parameter plugin Change-Id: I6c99e88751c0b7913145801e0f0fb4efed8a281a" into Unified_Grid
Former-commit-id: 8c6a9c6719 [formerly 2c39f2e584] [formerly 8c6a9c6719 [formerly 2c39f2e584] [formerly 54b7b9ed09 [formerly a0ec82d660d95f6d8e0866d03ccc6fa97b361a71]]]
Former-commit-id: 54b7b9ed09
Former-commit-id: 41eb2f3d9a [formerly 7f93237af0]
Former-commit-id: 08866f0426
2012-09-12 11:45:08 -05:00
Steve Harris
5030894212 12.10.1-3 baseline
Former-commit-id: de1639aea2 [formerly 21f430062b] [formerly de1639aea2 [formerly 21f430062b] [formerly 969e7e6dfd [formerly 1a94c1ca3674c8e4dbb8847de5190efe33da371c]]]
Former-commit-id: 969e7e6dfd
Former-commit-id: f376a4b4db [formerly 438d139fdd]
Former-commit-id: faadb51529
2012-09-11 16:00:38 -05:00
Steve Harris
5684a84a46 12.10.1-2 baseline
Former-commit-id: dde1f4c54d [formerly 250f0ccac9] [formerly dde1f4c54d [formerly 250f0ccac9] [formerly a66f3f4b60 [formerly 3dab4c2eb757ceea21f4db5bb78e8b92767dd18c]]]
Former-commit-id: a66f3f4b60
Former-commit-id: ec74f638e5 [formerly 34d2ddee9d]
Former-commit-id: cc3c3dadee
2012-09-11 15:50:57 -05:00
Ben Steffensmeier
e4746820f6 Issue #189 initial checkin of parameter plugin
Change-Id: I6c99e88751c0b7913145801e0f0fb4efed8a281a

Former-commit-id: 0bfedb4e54 [formerly b3ead4e169] [formerly 0bfedb4e54 [formerly b3ead4e169] [formerly a563707ad5 [formerly 65d5edae30817a65dd46374c18907894d92f2972]]]
Former-commit-id: a563707ad5
Former-commit-id: a039d55916 [formerly e3b5a5effc]
Former-commit-id: 0b29bd7562
2012-09-10 14:24:32 -05:00
Steve Harris
a924a8347a 12.10.1-1 baseline
Former-commit-id: 0abf64b77c [formerly 195158c004] [formerly 0abf64b77c [formerly 195158c004] [formerly d708932029 [formerly 7d17407c5b0a4a3f9b4b083891a5a5975c645810]]]
Former-commit-id: d708932029
Former-commit-id: e720b8ed31 [formerly 7bd9c63dc7]
Former-commit-id: d65f35ffe9
2012-09-04 12:07:27 -05:00
Steve Harris
c1e601dc30 12.9.1-12 baseline
Former-commit-id: 4bf4f0043a [formerly 948766c387] [formerly 4bf4f0043a [formerly 948766c387] [formerly 150bc967a5 [formerly 09035ea929c2e926b2dce13429c29d3fd3707880]]]
Former-commit-id: 150bc967a5
Former-commit-id: 782941ccc1 [formerly 9311c1737e]
Former-commit-id: 38aa573545
2012-09-04 11:47:38 -05:00
Steve Harris
982804ee0e 12.9.1-11 baseline
Former-commit-id: d07c18918d [formerly 6eb6b0909b] [formerly d07c18918d [formerly 6eb6b0909b] [formerly fc405efab7 [formerly 046d9078b7aa87ff8df98142556713fe38d95c63]]]
Former-commit-id: fc405efab7
Former-commit-id: dc5ec3d16d [formerly a14374fcd4]
Former-commit-id: f401755cde
2012-08-30 14:36:12 -05:00
Steve Harris
ede38c4b3f 12.9.1-10 baseline
Former-commit-id: bdb45cdfae [formerly 3adc50a783] [formerly bdb45cdfae [formerly 3adc50a783] [formerly cb9b80f3a0 [formerly 32048810bc091d7ba09a321c36cd5a78b2d4bd39]]]
Former-commit-id: cb9b80f3a0
Former-commit-id: f43a5af47f [formerly dc08c5a71a]
Former-commit-id: 5bb474d33c
2012-08-30 14:28:27 -05:00
Steve Harris
d404638d82 12.9.1-5 baseline (with forgotten bin files now included)
Former-commit-id: 7a4f4ac493 [formerly b8ab6066f6] [formerly 7a4f4ac493 [formerly b8ab6066f6] [formerly b77a4d40d7 [formerly e977bd92cef6986b14725164c9eaa417ecf359cf]]]
Former-commit-id: b77a4d40d7
Former-commit-id: 34fa4b5804 [formerly b2c0dd1abb]
Former-commit-id: 8f1120f6d8
2012-08-22 16:00:33 -05:00
Steve Harris
2d928d328e 12.9.1-5 baseline
Former-commit-id: a1d931fd44 [formerly 61f269f54c] [formerly a1d931fd44 [formerly 61f269f54c] [formerly f2fac39428 [formerly d85b989f77196d20eb2d2a21cf4daa13d50474ae]]]
Former-commit-id: f2fac39428
Former-commit-id: 7fb0b17bd5 [formerly 72824561cb]
Former-commit-id: 9b5c2094ed
2012-08-21 15:27:03 -05:00
Steve Harris
7e1d1f6e08 12.9.1-4 baseline
Former-commit-id: 36c108e960 [formerly dcda3a2290] [formerly 36c108e960 [formerly dcda3a2290] [formerly 33b95fb96d [formerly df38541c9df38c634626ae214f288b606004a768]]]
Former-commit-id: 33b95fb96d
Former-commit-id: d7d60cc623 [formerly 9990bf909b]
Former-commit-id: de9b64b501
2012-08-15 15:19:10 -05:00
Steve Harris
03bb51ed0e 12.9.1-3 baseline
Former-commit-id: c11f7d396e [formerly 36d80b1f60] [formerly c11f7d396e [formerly 36d80b1f60] [formerly 84bbf2573e [formerly 8e8d15d59bddec475b41e963da4ad0ad5b2c7e86]]]
Former-commit-id: 84bbf2573e
Former-commit-id: a535b51eba [formerly edbbacfa8a]
Former-commit-id: 8c5c5ad6eb
2012-08-15 14:26:10 -05:00
Steve Harris
adf346e7d3 12.9.1-2 baseline
Former-commit-id: 27871051e3 [formerly d1d877d319] [formerly 27871051e3 [formerly d1d877d319] [formerly a198b3a807 [formerly 4d7a2d3ad046df5dabf1a2ec6c24a37f8bbdc2d2]]]
Former-commit-id: a198b3a807
Former-commit-id: de4c812834 [formerly 448ed038c2]
Former-commit-id: ed416f241e
2012-08-15 14:12:24 -05:00
Steve Harris
16d7d955fc 12.9.1-1 baseline
Former-commit-id: 8309193ce9 [formerly 31ae7ea218] [formerly 8309193ce9 [formerly 31ae7ea218] [formerly 79ce6cfd97 [formerly 6601ddb09c2928754c2c3859dac284998d73ff81]]]
Former-commit-id: 79ce6cfd97
Former-commit-id: aed7a644df [formerly 0c5d9e2416]
Former-commit-id: 63bcadf121
2012-08-15 13:59:00 -05:00
Steve Harris
78d66ba6df 12.8.1-10 baseline
Former-commit-id: 6244359a80 [formerly b5e8fee24d] [formerly 6244359a80 [formerly b5e8fee24d] [formerly ca25d508ec [formerly 7c799ab7b99993c77b6568529b46aaf13d01300b]]]
Former-commit-id: ca25d508ec
Former-commit-id: 78d34d65d2 [formerly d5563fc340]
Former-commit-id: 46daa48f1c
2012-08-06 09:34:26 -05:00
Steve Harris
d3be09bd74 12.8.1-5 baseline
Former-commit-id: 2653ddc2e3 [formerly fd2abfb6f1] [formerly 2653ddc2e3 [formerly fd2abfb6f1] [formerly cd49ef3eda [formerly 99fb675cc2e1b94825ccda1fe09b1be0c3c25b3f]]]
Former-commit-id: cd49ef3eda
Former-commit-id: dab00b12e6 [formerly e0c3722fd1]
Former-commit-id: e86949a8d3
2012-08-01 10:45:37 -05:00
Steve Harris
36e2ad3023 12.7.1-8 baseline
Former-commit-id: 11f96dbedd [formerly 16bf591a33] [formerly 11f96dbedd [formerly 16bf591a33] [formerly c42ae0fa39 [formerly 46767a18a0d6e1f2182720c8a04c6e1e59cb18a1]]]
Former-commit-id: c42ae0fa39
Former-commit-id: f2102bfb24 [formerly 9f97182964]
Former-commit-id: 9aabe438b9
2012-07-19 16:20:40 -05:00
Steve Harris
37f2b6e138 12.6.1-9 baseline
Former-commit-id: 7c064b6868 [formerly 2c0ff851ca] [formerly 7c064b6868 [formerly 2c0ff851ca] [formerly 27afa60345 [formerly 8f93efb93ec2d244fe599c16b3af5b33784c0232]]]
Former-commit-id: 27afa60345
Former-commit-id: dc50bc8443 [formerly 4f7bb90bb0]
Former-commit-id: d5fa61041b
2012-07-10 07:53:49 -05:00
Steve Harris
52251f3595 Issue #708 - removed extraneous files
Former-commit-id: d2e6687295 [formerly 1a67fdba3f] [formerly d2e6687295 [formerly 1a67fdba3f] [formerly fbe7e50417 [formerly 389c544088260bd6d6d107f51dc36426e9af3229]]]
Former-commit-id: fbe7e50417
Former-commit-id: 026a14fc2c [formerly eca93e924c]
Former-commit-id: 6325fcc6f1
2012-06-20 08:15:55 -05:00
Steve Harris
d1b2c73b81 Merge branch 'master' into ss_sync
Former-commit-id: 5a5db8dc6a [formerly d507f3b71d] [formerly 5a5db8dc6a [formerly d507f3b71d] [formerly 645359deaf [formerly 3b20277effa5ff76e68610d2d85afc950aae3387]]]
Former-commit-id: 645359deaf
Former-commit-id: 0c29bee8e1 [formerly c778c97bd6]
Former-commit-id: a6fd9689d5
2012-06-13 14:56:52 -05:00
Steve Harris
39ff9954f8 12.5.1-15 baseline
Former-commit-id: 8552902906 [formerly b13cbb7e00] [formerly 8552902906 [formerly b13cbb7e00] [formerly 3904c4ccf5 [formerly 4909e0dd166e43c22a34d96aa744f51db8a7d6c0]]]
Former-commit-id: 3904c4ccf5
Former-commit-id: 97c4db937e [formerly 676ea3192f]
Former-commit-id: 9054c5ab6c
2012-06-08 13:39:48 -05:00
Max Schenkelberg
4ddcccc3c7 Issue #358 Fixed merge errors when merging core_exp into ss_sync
Former-commit-id: 2ef208b263 [formerly 3fe183277b] [formerly 2ef208b263 [formerly 3fe183277b] [formerly e3d6962fe6 [formerly e8846fa2b5aa1ef2972f134a683246bc275a8067]]]
Former-commit-id: e3d6962fe6
Former-commit-id: 338f80fa87 [formerly 878de45ee6]
Former-commit-id: 9f72069996
2012-05-01 18:36:09 -05:00