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/5b85be04 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5b85be04 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5b85be04 Branch: refs/heads/trunk Commit: 5b85be04cbf49e306cd43563ee85652484179812 Parents: 500503d f7e690d Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Wed Apr 2 20:32:49 2014 +0200 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Wed Apr 2 20:32:49 2014 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../apache/cassandra/cql3/ColumnCondition.java | 176 ++++++++++--------- .../cql3/statements/CQL3CasConditions.java | 11 +- 3 files changed, 104 insertions(+), 84 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5b85be04/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5b85be04/src/java/org/apache/cassandra/cql3/statements/CQL3CasConditions.java ----------------------------------------------------------------------
