Updated Branches: refs/heads/trunk 278a5e860 -> 6190a711c
Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6190a711 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6190a711 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6190a711 Branch: refs/heads/trunk Commit: 6190a711c6c1b27828349973eab9b06e946ad8c1 Parents: 278a5e8 4cd8136 Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Tue Feb 19 00:02:19 2013 +0100 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Tue Feb 19 00:02:19 2013 +0100 ---------------------------------------------------------------------- .../stress/operations/CqlCounterAdder.java | 6 ++-- .../stress/operations/CqlCounterGetter.java | 6 ++-- .../stress/operations/CqlIndexedRangeSlicer.java | 4 +- .../cassandra/stress/operations/CqlInserter.java | 4 +- .../stress/operations/CqlRangeSlicer.java | 6 ++-- .../cassandra/stress/operations/CqlReader.java | 4 +- .../apache/cassandra/stress/util/Operation.java | 16 +++++++++----- 7 files changed, 25 insertions(+), 21 deletions(-) ----------------------------------------------------------------------
