You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by bl...@apache.org on 2016/12/15 17:15:27 UTC
[3/4] cassandra git commit: Merge branch cassandra-3.11 into
cassandra-3.X
Merge branch cassandra-3.11 into cassandra-3.X
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e5a77cfe
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e5a77cfe
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e5a77cfe
Branch: refs/heads/trunk
Commit: e5a77cfeaa2be7f6c68965603e7a87034ff7b576
Parents: de84f26 73547a3
Author: Benjamin Lerer <b....@gmail.com>
Authored: Thu Dec 15 18:09:52 2016 +0100
Committer: Benjamin Lerer <b....@gmail.com>
Committed: Thu Dec 15 18:10:01 2016 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../restrictions/StatementRestrictions.java | 11 +++
.../cql3/statements/BatchStatement.java | 11 ++-
.../cql3/statements/ModificationStatement.java | 10 ++-
.../cql3/validation/operations/BatchTest.java | 40 +++++++++++
.../cql3/validation/operations/DeleteTest.java | 57 ++++++++++++++++
.../operations/InsertUpdateIfConditionTest.java | 6 ++
.../cql3/validation/operations/UpdateTest.java | 70 ++++++++++++++++++++
8 files changed, 194 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e5a77cfe/CHANGES.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e5a77cfe/src/java/org/apache/cassandra/cql3/statements/BatchStatement.java
----------------------------------------------------------------------