Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5d4ca6eb Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5d4ca6eb Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5d4ca6eb Branch: refs/heads/trunk Commit: 5d4ca6eb0346c716d822a6983a28fc11939470a4 Parents: 63e0eb4 3b4084b Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Fri Feb 21 11:07:01 2014 +0100 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Fri Feb 21 11:07:01 2014 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../cql3/statements/BatchStatement.java | 57 ++++++++++++++------ .../cql3/statements/ModificationStatement.java | 40 +++++++------- .../cql3/statements/UpdateStatement.java | 8 --- .../apache/cassandra/db/CounterMutation.java | 5 ++ 5 files changed, 66 insertions(+), 45 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5d4ca6eb/CHANGES.txt ----------------------------------------------------------------------
