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/4210a25a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4210a25a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4210a25a Branch: refs/heads/trunk Commit: 4210a25a909c629c19db5d91de671c2a0f9fa28b Parents: 4ed0060 70ee4ed Author: Robert Stupp <sn...@snazy.de> Authored: Wed Jun 15 11:47:37 2016 +0200 Committer: Robert Stupp <sn...@snazy.de> Committed: Wed Jun 15 11:47:37 2016 +0200 ---------------------------------------------------------------------- CHANGES.txt | 2 +- .../apache/cassandra/repair/RepairRunnable.java | 7 ++++++- .../cassandra/service/ActiveRepairService.java | 7 +++++-- .../service/ActiveRepairServiceTest.java | 18 ++++++++++-------- 4 files changed, 22 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4210a25a/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index dbcfa34,3eb420d..c9fa673 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -20,11 -8,8 +21,10 @@@ Merged from 2.1 * Create interval tree over canonical sstables to avoid missing sstables during streaming (CASSANDRA-11886) * cqlsh COPY FROM: shutdown parent cluster after forking, to avoid corrupting SSL connections (CASSANDRA-11749) -- -3.0.7 +3.7 + * Support multiple folders for user defined compaction tasks (CASSANDRA-11765) + * Fix race in CompactionStrategyManager's pause/resume (CASSANDRA-11922) +Merged from 3.0: * Fix legacy serialization of Thrift-generated non-compound range tombstones when communicating with 2.x nodes (CASSANDRA-11930) * Fix Directories instantiations where CFS.initialDirectories should be used (CASSANDRA-11849) http://git-wip-us.apache.org/repos/asf/cassandra/blob/4210a25a/src/java/org/apache/cassandra/repair/RepairRunnable.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4210a25a/src/java/org/apache/cassandra/service/ActiveRepairService.java ----------------------------------------------------------------------
