Updated Branches: refs/heads/trunk 47e6f3799 -> 46f1c7fab
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/46f1c7fa Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/46f1c7fa Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/46f1c7fa Branch: refs/heads/trunk Commit: 46f1c7fabd6a7102a7a363bcfdc40c62a3bdc461 Parents: 47e6f37 f65e520 Author: Sylvain Lebresne <[email protected]> Authored: Wed Dec 5 09:03:11 2012 +0100 Committer: Sylvain Lebresne <[email protected]> Committed: Wed Dec 5 09:03:11 2012 +0100 ---------------------------------------------------------------------- CHANGES.txt | 2 + .../cql3/operations/PreparedOperation.java | 4 + .../cassandra/cql3/statements/UpdateStatement.java | 99 ++++++--------- 3 files changed, 45 insertions(+), 60 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/46f1c7fa/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/46f1c7fa/src/java/org/apache/cassandra/cql3/statements/UpdateStatement.java ----------------------------------------------------------------------
