cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From slebre...@apache.org
Subject [1/3] git commit: Merge branch 'cassandra-1.2' into trunk
Date Wed, 21 Nov 2012 16:25:40 GMT
Updated Branches:
  refs/heads/trunk 6a0d02c76 -> 3bd353f91


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/3bd353f9
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3bd353f9
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3bd353f9

Branch: refs/heads/trunk
Commit: 3bd353f91a0c29c9f488b6e9bcd33373348daa1e
Parents: 6a0d02c a9deba2
Author: Sylvain Lebresne <sylvain@datastax.com>
Authored: Wed Nov 21 17:25:35 2012 +0100
Committer: Sylvain Lebresne <sylvain@datastax.com>
Committed: Wed Nov 21 17:25:35 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/3bd353f9/CHANGES.txt
----------------------------------------------------------------------


Mime
View raw message