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/70517107 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/70517107 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/70517107 Branch: refs/heads/trunk Commit: 705171074f0270a7bd5bb406d5a6b5192d9bd44d Parents: 90387f6 13510d4 Author: Sylvain Lebresne <[email protected]> Authored: Wed Apr 2 21:38:29 2014 +0200 Committer: Sylvain Lebresne <[email protected]> Committed: Wed Apr 2 21:38:29 2014 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../apache/cassandra/cql3/ColumnCondition.java | 126 +++++++++++++++++-- src/java/org/apache/cassandra/cql3/Cql.g | 4 +- .../cql3/statements/CQL3CasConditions.java | 5 +- 4 files changed, 123 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/70517107/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/70517107/src/java/org/apache/cassandra/cql3/statements/CQL3CasConditions.java ----------------------------------------------------------------------
