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:28 UTC
[4/4] cassandra git commit: Merge branch cassandra-3.X into trunk
Merge branch cassandra-3.X into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0f67b540
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0f67b540
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0f67b540
Branch: refs/heads/trunk
Commit: 0f67b540e8e2c022348e8c163879d433e8d18fc3
Parents: b88ddb8 e5a77cf
Author: Benjamin Lerer <b....@gmail.com>
Authored: Thu Dec 15 18:14:44 2016 +0100
Committer: Benjamin Lerer <b....@gmail.com>
Committed: Thu Dec 15 18:14:56 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/0f67b540/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 9e7dd80,d32d91c..e0c5637
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -133,8 -123,9 +133,9 @@@
* Remove pre-startup check for open JMX port (CASSANDRA-12074)
* Remove compaction Severity from DynamicEndpointSnitch (CASSANDRA-11738)
* Restore resumable hints delivery (CASSANDRA-11960)
- * Properly report LWT contention (CASSANDRA-12626)
+ * Properly record CAS contention (CASSANDRA-12626)
Merged from 3.0:
+ * Fix DELETE and UPDATE queries with empty IN restrictions (CASSANDRA-12829)
* Mark MVs as built after successful bootstrap (CASSANDRA-12984)
* Estimated TS drop-time histogram updated with Cell.NO_DELETION_TIME (CASSANDRA-13040)
* Nodetool compactionstats fails with NullPointerException (CASSANDRA-13021)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0f67b540/src/java/org/apache/cassandra/cql3/restrictions/StatementRestrictions.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0f67b540/src/java/org/apache/cassandra/cql3/statements/BatchStatement.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0f67b540/src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java
----------------------------------------------------------------------