cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From slebre...@apache.org
Subject [6/6] cassandra git commit: Merge branch 'cassandra-3.X' into trunk
Date Mon, 07 Nov 2016 13:11:20 GMT
Merge branch 'cassandra-3.X' into trunk

* cassandra-3.X:
  Batch with multiple conditional updates for the same partition causes AssertionError


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c47d395d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c47d395d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c47d395d

Branch: refs/heads/trunk
Commit: c47d395d86d44a5ad48434a320826de3c1eb4a2b
Parents: 0e132f4 2b45673
Author: Sylvain Lebresne <sylvain@datastax.com>
Authored: Mon Nov 7 14:10:54 2016 +0100
Committer: Sylvain Lebresne <sylvain@datastax.com>
Committed: Mon Nov 7 14:10:54 2016 +0100

----------------------------------------------------------------------
 CHANGES.txt                                     |   1 +
 .../cql3/statements/CQL3CasRequest.java         |  27 ++++-
 .../operations/InsertUpdateIfConditionTest.java | 104 +++++++++++++++++++
 3 files changed, 127 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/c47d395d/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 446d550,1123553..bbe79e6
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -105,8 -97,9 +105,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:
+  * Batch with multiple conditional updates for the same partition causes AssertionError
(CASSANDRA-12867)
   * Make AbstractReplicationStrategy extendable from outside its package (CASSANDRA-12788)
   * Don't tell users to turn off consistent rangemovements during rebuild. (CASSANDRA-12296)
   * Fix CommitLogTest.testDeleteIfNotDirty (CASSANDRA-12854)


Mime
View raw message