You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by st...@apache.org on 2016/11/07 02:35:24 UTC
[6/6] 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/9ed4face
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9ed4face
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9ed4face
Branch: refs/heads/trunk
Commit: 9ed4faceb36b35a04e32d8adc4d7f7c35d6ff74d
Parents: 22a3db0 80843c9
Author: Stefania Alborghetti <st...@datastax.com>
Authored: Mon Nov 7 10:33:43 2016 +0800
Committer: Stefania Alborghetti <st...@datastax.com>
Committed: Mon Nov 7 10:33:43 2016 +0800
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../apache/cassandra/schema/KeyspaceParams.java | 11 +++++++-
.../cassandra/db/commitlog/CommitLogTest.java | 29 ++++++++++++++++++--
3 files changed, 38 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9ed4face/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index fb16d4b,3157e8e..5eb2850
--- 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:
+ * Fix CommitLogTest.testDeleteIfNotDirty (CASSANDRA-12854)
* Avoid deadlock due to MV lock contention (CASSANDRA-12689)
* Fix for KeyCacheCqlTest flakiness (CASSANDRA-12801)
* Include SSTable filename in compacting large row message (CASSANDRA-12384)