Updated Branches: refs/heads/trunk 7d539d754 -> 549996eab
Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/549996ea Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/549996ea Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/549996ea Branch: refs/heads/trunk Commit: 549996eab3806f692957db25e9b408edf26c0dd1 Parents: 7d539d7 1891316 Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Fri Jan 11 18:01:10 2013 +0100 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Fri Jan 11 18:01:10 2013 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../cassandra/cql3/operations/SetOperation.java | 20 +++++++++++++++ .../cassandra/cql3/statements/UpdateStatement.java | 15 +++++++++- 3 files changed, 34 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/549996ea/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/549996ea/src/java/org/apache/cassandra/cql3/operations/SetOperation.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/549996ea/src/java/org/apache/cassandra/cql3/statements/UpdateStatement.java ----------------------------------------------------------------------
