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/301bcae6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/301bcae6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/301bcae6 Branch: refs/heads/trunk Commit: 301bcae6797c926669e909f05cf65abb7af2b7db Parents: 56eb7d9 cd4dd6b Author: Marcus Eriksson <[email protected]> Authored: Thu May 26 09:53:58 2016 +0200 Committer: Marcus Eriksson <[email protected]> Committed: Thu May 26 09:53:58 2016 +0200 ---------------------------------------------------------------------- .../compaction/AbstractCompactionStrategy.java | 2 +- .../db/compaction/CompactionController.java | 22 +++- .../cassandra/db/compaction/NeverPurgeTest.java | 132 +++++++++++++++++++ 3 files changed, 152 insertions(+), 4 deletions(-) ----------------------------------------------------------------------
