Merge branch cassandra-3.0 into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/fcdc4e1d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fcdc4e1d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fcdc4e1d Branch: refs/heads/trunk Commit: fcdc4e1d70434ddbdf8a0180cb3b15bf501a3dec Parents: a9060f0 a880739 Author: blerer <[email protected]> Authored: Tue Oct 20 14:12:26 2015 +0200 Committer: blerer <[email protected]> Committed: Tue Oct 20 14:12:41 2015 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + pylib/cqlshlib/cql3handling.py | 4 ++-- .../org/apache/cassandra/cql3/Operations.java | 16 ++++++++++++- .../cql3/statements/DeleteStatement.java | 7 +++--- .../cql3/statements/ModificationStatement.java | 21 +++++++++------- .../cql3/statements/UpdateStatement.java | 25 ++++++++++---------- .../operations/InsertUpdateIfConditionTest.java | 11 +++++++++ 7 files changed, 57 insertions(+), 28 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/fcdc4e1d/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/fcdc4e1d/src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java ----------------------------------------------------------------------
