Merge branch 'cassandra-3.0' into cassandra-3.7
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/cd4dd6bf Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cd4dd6bf Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cd4dd6bf Branch: refs/heads/cassandra-3.7 Commit: cd4dd6bf38787a2237adb1bd25a13ebd2abb4f48 Parents: e0800e7 a3d0556 Author: Marcus Eriksson <[email protected]> Authored: Thu May 26 09:22:04 2016 +0200 Committer: Marcus Eriksson <[email protected]> Committed: Thu May 26 09:22:04 2016 +0200 ---------------------------------------------------------------------- .../compaction/AbstractCompactionStrategy.java | 2 +- .../db/compaction/CompactionController.java | 22 +++- .../cassandra/db/compaction/NeverPurgeTest.java | 132 +++++++++++++++++++ 3 files changed, 152 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/cd4dd6bf/src/java/org/apache/cassandra/db/compaction/AbstractCompactionStrategy.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/cd4dd6bf/src/java/org/apache/cassandra/db/compaction/CompactionController.java ----------------------------------------------------------------------
