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/6eb65e5a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6eb65e5a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6eb65e5a Branch: refs/heads/cassandra-3.11 Commit: 6eb65e5a23d3af30b2ecc1f5ea25c30c3b14e284 Parents: 43aa79d 21978bf Author: Marcus Eriksson <marc...@apache.org> Authored: Fri Feb 9 16:20:32 2018 +0100 Committer: Marcus Eriksson <marc...@apache.org> Committed: Fri Feb 9 16:22:02 2018 +0100 ---------------------------------------------------------------------- CHANGES.txt | 2 +- .../cassandra/db/compaction/Verifier.java | 2 + .../io/util/DataIntegrityMetadata.java | 2 +- .../org/apache/cassandra/db/VerifyTest.java | 39 ++++++++++++++++++++ .../cassandra/io/sstable/LegacySSTableTest.java | 18 +++++++++ 5 files changed, 61 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/6eb65e5a/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 4eb03e5,f42f3f4..c38b69b --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,28 -1,7 +1,28 @@@ -3.0.16 +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) + * Correctly count range tombstones in traces and tombstone thresholds (CASSANDRA-8527) - +Merged from 3.0: + * Use the correct digest file and reload sstable metadata in nodetool verify (CASSANDRA-14217) * Handle failure when mutating repaired status in Verifier (CASSANDRA-13933) - * Close socket on error during connect on OutboundTcpConnection (CASSANDRA-9630) * 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/6eb65e5a/src/java/org/apache/cassandra/db/compaction/Verifier.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/6eb65e5a/src/java/org/apache/cassandra/io/util/DataIntegrityMetadata.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/6eb65e5a/test/unit/org/apache/cassandra/db/VerifyTest.java ---------------------------------------------------------------------- diff --cc test/unit/org/apache/cassandra/db/VerifyTest.java index 6808c47,0748270..a332f74 --- a/test/unit/org/apache/cassandra/db/VerifyTest.java +++ b/test/unit/org/apache/cassandra/db/VerifyTest.java @@@ -23,8 -23,8 +23,9 @@@ import com.google.common.base.Charsets import org.apache.cassandra.OrderedJUnit4ClassRunner; import org.apache.cassandra.SchemaLoader; import org.apache.cassandra.Util; +import org.apache.cassandra.cache.ChunkCache; import org.apache.cassandra.UpdateBuilder; + import org.apache.cassandra.db.compaction.AbstractCompactionStrategy; import org.apache.cassandra.db.compaction.CompactionManager; import org.apache.cassandra.db.compaction.Verifier; import org.apache.cassandra.db.marshal.UUIDType; http://git-wip-us.apache.org/repos/asf/cassandra/blob/6eb65e5a/test/unit/org/apache/cassandra/io/sstable/LegacySSTableTest.java ---------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
