Commit Graph

11 Commits

Author SHA1 Message Date
Jonathan Ellis f849aa210f merge from 0.8
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1097952 13f79535-47bb-0310-9956-ffa450edef68
2011-04-29 20:59:49 +00:00
Jonathan Ellis 2d95cb4957 merge from 0.8
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1095492 13f79535-47bb-0310-9956-ffa450edef68
2011-04-20 19:50:50 +00:00
Jonathan Ellis 1adcd1c52e merge from 0.8
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1095139 13f79535-47bb-0310-9956-ffa450edef68
2011-04-19 17:13:19 +00:00
Gary Dusbabek 8a6feefe8f merge from 0.8
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1092687 13f79535-47bb-0310-9956-ffa450edef68
2011-04-15 12:48:15 +00:00
Jonathan Ellis 58307994b5 merge from 0.8
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1091784 13f79535-47bb-0310-9956-ffa450edef68
2011-04-13 13:59:39 +00:00
Sylvain Lebresne 9a0bbc542b Merge COSC and Counter thrift structure
patch by slebresne; reviewed by jbellis for CASSANDRA-2440


git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1090842 13f79535-47bb-0310-9956-ffa450edef68
2011-04-10 17:31:15 +00:00
Sylvain Lebresne 65cdc6551f Fix stress for CASSANDRA-2384 (patch by stuhood)
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1089985 13f79535-47bb-0310-9956-ffa450edef68
2011-04-07 20:20:00 +00:00
Jonathan Ellis 358475ae24 move stress package from o.a.c.contrib to o.a.c
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1087745 13f79535-47bb-0310-9956-ffa450edef68
2011-04-01 15:19:38 +00:00
Jonathan Ellis 944ed31f60 move example code from contrib/ to examples/, and tools from contrib/ to tools/
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1087744 13f79535-47bb-0310-9956-ffa450edef68
2011-04-01 15:19:27 +00:00
Jonathan Ellis 6ea9d2af58 Revert incomplete move of sstable [ex/im]port code
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1087739 13f79535-47bb-0310-9956-ffa450edef68
2011-04-01 15:12:47 +00:00
Jonathan Ellis 04bb3e4b10 upgrade to whirr 0.4
patch by Pavel Yaskevich for CASSANDRA-2265

git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1087736 13f79535-47bb-0310-9956-ffa450edef68
2011-04-01 15:05:03 +00:00