Merge branch 'cassandra-3.0' into cassandra-3.9
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/717c6d6b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/717c6d6b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/717c6d6b Branch: refs/heads/cassandra-3.9 Commit: 717c6d6bf8f9dc02a25dd064f1b7d70df8e8aa3d Parents: 245fc2a f5c9d6e Author: Stefania Alborghetti <stefania.alborghe...@datastax.com> Authored: Wed Aug 3 11:01:57 2016 +0800 Committer: Stefania Alborghetti <stefania.alborghe...@datastax.com> Committed: Wed Aug 3 11:01:57 2016 +0800 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../compaction/BlacklistingCompactionsTest.java | 33 ++++++++++++++------ 2 files changed, 25 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/717c6d6b/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 5647cd4,d78345a..bb58e77 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,9 -1,5 +1,10 @@@ -3.0.9 +3.9 + * Fixed flacky SSTablesIteratedTest (CASSANDRA-12282) + * Fixed flacky SSTableRewriterTest: check file counts before calling validateCFS (CASSANDRA-12348) + * cqlsh: Fix handling of $$-escaped strings (CASSANDRA-12189) + * Fix SSL JMX requiring truststore containing server cert (CASSANDRA-12109) +Merged from 3.0: + * Fixed flacky BlacklistingCompactionsTest, switched to fixed size types and increased corruption size (CASSANDRA-12359) * Rerun ReplicationAwareTokenAllocatorTest on failure to avoid flakiness (CASSANDRA-12277) * Exception when computing read-repair for range tombstones (CASSANDRA-12263) * Lost counter writes in compact table and static columns (CASSANDRA-12219) http://git-wip-us.apache.org/repos/asf/cassandra/blob/717c6d6b/test/unit/org/apache/cassandra/db/compaction/BlacklistingCompactionsTest.java ---------------------------------------------------------------------- diff --cc test/unit/org/apache/cassandra/db/compaction/BlacklistingCompactionsTest.java index 54579fb,6378e09..f08ea97 --- a/test/unit/org/apache/cassandra/db/compaction/BlacklistingCompactionsTest.java +++ b/test/unit/org/apache/cassandra/db/compaction/BlacklistingCompactionsTest.java @@@ -37,9 -37,9 +37,10 @@@ import static org.junit.Assert.assertNo import org.apache.cassandra.SchemaLoader; import org.apache.cassandra.Util; +import org.apache.cassandra.cache.ChunkCache; import org.apache.cassandra.config.*; import org.apache.cassandra.db.*; + import org.apache.cassandra.db.marshal.LongType; import org.apache.cassandra.exceptions.ConfigurationException; import org.apache.cassandra.io.sstable.format.SSTableReader; import org.apache.cassandra.io.util.FileUtils;