Merge branch 'cassandra-3.7' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/59896cb8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/59896cb8 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/59896cb8 Branch: refs/heads/trunk Commit: 59896cb826289debaf8d357cda574b979c67a89a Parents: 9b47dd5 b2a9c56 Author: Marcus Eriksson <[email protected]> Authored: Tue May 24 07:46:13 2016 +0200 Committer: Marcus Eriksson <[email protected]> Committed: Tue May 24 07:46:13 2016 +0200 ---------------------------------------------------------------------- CHANGES.txt | 2 + .../db/compaction/CompactionManager.java | 2 +- .../cassandra/service/ActiveRepairService.java | 59 ++++++++++------- .../service/ActiveRepairServiceTest.java | 66 +++++++++++++++++++- 4 files changed, 102 insertions(+), 27 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/59896cb8/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/59896cb8/src/java/org/apache/cassandra/service/ActiveRepairService.java ----------------------------------------------------------------------
