You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ma...@apache.org on 2018/02/07 08:12:06 UTC
[5/6] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.11
Merge branch 'cassandra-3.0' into cassandra-3.11
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d3691909
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d3691909
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d3691909
Branch: refs/heads/cassandra-3.11
Commit: d369190964be9a6011f707a7e584446f9ec57a73
Parents: de6c62d 7885a70
Author: Marcus Eriksson <ma...@apache.org>
Authored: Wed Feb 7 09:06:19 2018 +0100
Committer: Marcus Eriksson <ma...@apache.org>
Committed: Wed Feb 7 09:06:19 2018 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../org/apache/cassandra/db/compaction/Verifier.java | 11 ++++++++++-
2 files changed, 11 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d3691909/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 30ca8a8,4e8f2ac..8c0d8f0
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,25 -1,6 +1,26 @@@
-3.0.16
- * Handle failure when mutating repaired status in Verifier (CASSANDRA-13933)
+3.11.2
+ * Remove dependencies on JVM internal classes from JMXServerUtils (CASSANDRA-14173)
+ * Add DEFAULT, UNSET, MBEAN and MBEANS to `ReservedKeywords` (CASSANDRA-14205)
+ * Add Unittest for schema migration fix (CASSANDRA-14140)
+ * Print correct snitch info from nodetool describecluster (CASSANDRA-13528)
* Close socket on error during connect on OutboundTcpConnection (CASSANDRA-9630)
+ * Enable CDC unittest (CASSANDRA-14141)
+ * Acquire read lock before accessing CompactionStrategyManager fields (CASSANDRA-14139)
+ * Split CommitLogStressTest to avoid timeout (CASSANDRA-14143)
+ * Avoid invalidating disk boundaries unnecessarily (CASSANDRA-14083)
+ * Avoid exposing compaction strategy index externally (CASSANDRA-14082)
+ * Prevent continuous schema exchange between 3.0 and 3.11 nodes (CASSANDRA-14109)
+ * Fix imbalanced disks when replacing node with same address with JBOD (CASSANDRA-14084)
+ * Reload compaction strategies when disk boundaries are invalidated (CASSANDRA-13948)
+ * Remove OpenJDK log warning (CASSANDRA-13916)
+ * Prevent compaction strategies from looping indefinitely (CASSANDRA-14079)
+ * Cache disk boundaries (CASSANDRA-13215)
+ * Add asm jar to build.xml for maven builds (CASSANDRA-11193)
+ * Round buffer size to powers of 2 for the chunk cache (CASSANDRA-13897)
+ * Update jackson JSON jars (CASSANDRA-13949)
+ * Avoid locks when checking LCS fanout and if we should defrag (CASSANDRA-13930)
+Merged from 3.0:
++ * Handle failure when mutating repaired status in Verifier (CASSANDRA-13933)
* Set encoding for javadoc generation (CASSANDRA-14154)
* Fix index target computation for dense composite tables with dropped compact storage (CASSANDRA-14104)
* Improve commit log chain marker updating (CASSANDRA-14108)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d3691909/src/java/org/apache/cassandra/db/compaction/Verifier.java
----------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org