merge from 0.8

git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-1.0.0@1178787 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Sylvain Lebresne 2011-10-04 13:51:42 +00:00
parent a81a52caba
commit f4ecf5a604
2 changed files with 2 additions and 1 deletions

View File

@ -10,6 +10,7 @@
* (Hadoop) allow wrapping ranges in queries (CASSANDRA-3137)
* (Hadoop) check all interfaces for a match with split location
before falling back to random replica (CASSANDRA-3211)
* Fix stress COUNTER_GET option (CASSANDRA-3301)
1.0.0-rc2

View File

@ -64,7 +64,7 @@ public class CounterGetter extends Operation
for (int j = 0; j < session.getSuperColumns(); j++)
{
String superColumn = 'S' + Integer.toString(j);
ColumnParent parent = new ColumnParent("CounterSuper1").setSuper_column(superColumn.getBytes());
ColumnParent parent = new ColumnParent("SuperCounter1").setSuper_column(superColumn.getBytes());
long start = System.currentTimeMillis();