Updated Branches: refs/heads/cassandra-1.2 c235229e9 -> 3479c636b
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/3479c636 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3479c636 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3479c636 Branch: refs/heads/cassandra-1.2 Commit: 3479c636baee9af58b742e4af80512823f9be138 Parents: c235229 b4f2f20 Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Wed Nov 21 09:14:03 2012 +0100 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Wed Nov 21 09:14:03 2012 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/cql3/Cql.g | 39 +++-- .../cassandra/cql3/operations/ColumnOperation.java | 27 +--- .../cassandra/cql3/operations/ListOperation.java | 83 +++++++-- .../cassandra/cql3/operations/MapOperation.java | 24 ++- .../cassandra/cql3/operations/Operation.java | 9 +- .../cql3/operations/PreparedOperation.java | 143 +++++++++++++++ .../cassandra/cql3/operations/SetOperation.java | 44 ++++- .../cassandra/cql3/statements/UpdateStatement.java | 25 +-- 9 files changed, 298 insertions(+), 97 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/3479c636/CHANGES.txt ----------------------------------------------------------------------
