Merge branch 'cassandra-3.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/10eda8b5 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/10eda8b5 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/10eda8b5 Branch: refs/heads/trunk Commit: 10eda8b57d22672c34742891448e6cbab102559a Parents: 07bc688 c2ea8c4 Author: Marcus Eriksson <[email protected]> Authored: Thu Nov 26 08:46:46 2015 +0100 Committer: Marcus Eriksson <[email protected]> Committed: Thu Nov 26 08:46:46 2015 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../db/compaction/CompactionManager.java | 6 +- .../org/apache/cassandra/db/CleanupTest.java | 77 ++++++++++++++++++++ 3 files changed, 82 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/10eda8b5/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/10eda8b5/src/java/org/apache/cassandra/db/compaction/CompactionManager.java ----------------------------------------------------------------------
