Merge branch 'cassandra-1.2.0' into cassandra-1.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a9deba21 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a9deba21 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a9deba21 Branch: refs/heads/trunk Commit: a9deba21100388f605f9373386d71567a069d5ef Parents: a4452ee e2df26b Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Wed Nov 21 17:25:20 2012 +0100 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Wed Nov 21 17:25:20 2012 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../src/org/apache/cassandra/stress/Session.java | 2 +- .../org/apache/cassandra/stress/StressAction.java | 1 - .../stress/operations/CqlCounterAdder.java | 21 +++++++++---- .../stress/operations/CqlCounterGetter.java | 23 +++++++++------ .../stress/operations/CqlIndexedRangeSlicer.java | 18 +++++++++-- .../cassandra/stress/operations/CqlInserter.java | 19 +++++++++--- .../stress/operations/CqlRangeSlicer.java | 20 +++++++++---- .../cassandra/stress/operations/CqlReader.java | 17 ++++++++--- 9 files changed, 84 insertions(+), 38 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a9deba21/CHANGES.txt ----------------------------------------------------------------------
