Merge branch 'cassandra-3.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d3f0c32f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d3f0c32f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d3f0c32f Branch: refs/heads/trunk Commit: d3f0c32f0224cc0f606ac1e1e24f41688af72e4f Parents: 93f77c7 d4fc9d0 Author: Marcus Eriksson <[email protected]> Authored: Mon Feb 8 09:04:17 2016 +0100 Committer: Marcus Eriksson <[email protected]> Committed: Mon Feb 8 09:04:17 2016 +0100 ---------------------------------------------------------------------- CHANGES.txt | 3 +++ .../db/compaction/DateTieredCompactionStrategy.java | 10 ++++++---- 2 files changed, 9 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d3f0c32f/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index a4f0421,0fb8f34..179da46 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -18,12 -2,11 +18,15 @@@ Merged from 3.0 * Hadoop integration is incompatible with Cassandra Driver 3.0.0 (CASSANDRA-11001) Merged from 2.2.6 * Gossiper#isEnabled is not thread safe (CASSANDRA-11116) + Merged from 2.1: + * Avoid major compaction mixing repaired and unrepaired sstables in DTCS (CASSANDRA-11113) + -3.0.3 +3.3 + * Avoid infinite loop if owned range is smaller than number of + data dirs (CASSANDRA-11034) + * Avoid bootstrap hanging when existing nodes have no data to stream (CASSANDRA-11010) +Merged from 3.0: * Remove double initialization of newly added tables (CASSANDRA-11027) * Filter keys searcher results by target range (CASSANDRA-11104) * Fix deserialization of legacy read commands (CASSANDRA-11087) http://git-wip-us.apache.org/repos/asf/cassandra/blob/d3f0c32f/src/java/org/apache/cassandra/db/compaction/DateTieredCompactionStrategy.java ----------------------------------------------------------------------
