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/e30d6dca Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e30d6dca Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e30d6dca Branch: refs/heads/trunk Commit: e30d6dca52cc33ab04f9296cb6961afdbf1e9c2b Parents: 35e5721 a052a91 Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Thu Mar 6 10:28:48 2014 +0100 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Thu Mar 6 10:28:48 2014 +0100 ---------------------------------------------------------------------- .../org/apache/cassandra/cql3/statements/CQL3CasConditions.java | 3 ++- .../apache/cassandra/cql3/statements/ModificationStatement.java | 4 +--- 2 files changed, 3 insertions(+), 4 deletions(-) ----------------------------------------------------------------------
