Merge branch 'cassandra-1.2.0' into cassandra-1.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4154434c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4154434c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4154434c Branch: refs/heads/trunk Commit: 4154434cfb5522a988684418afc28d9fafe43db0 Parents: 5c9572e a90b310 Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Thu Dec 6 08:41:28 2012 +0100 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Thu Dec 6 08:41:28 2012 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/cql3/Cql.g | 9 +- .../cassandra/cql3/operations/ColumnOperation.java | 7 ++ .../cassandra/cql3/operations/ListOperation.java | 61 ++++++++++++++- .../cassandra/cql3/operations/MapOperation.java | 29 +++++++ .../cassandra/cql3/operations/Operation.java | 3 + .../cql3/operations/PreparedOperation.java | 6 ++ .../cassandra/cql3/operations/SetOperation.java | 8 ++ .../cassandra/cql3/statements/BatchStatement.java | 2 +- .../cassandra/cql3/statements/DeleteStatement.java | 23 +++++- .../cql3/statements/ModificationStatement.java | 2 +- .../cassandra/cql3/statements/UpdateStatement.java | 14 +-- 12 files changed, 143 insertions(+), 22 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4154434c/CHANGES.txt ----------------------------------------------------------------------
