Merge branch 'cassandra-3.0' into cassandra-3.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c2ea8c4f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c2ea8c4f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c2ea8c4f Branch: refs/heads/trunk Commit: c2ea8c4fc82ec470710de51b41e6de429dfebc80 Parents: 138f8db 71bca78 Author: Marcus Eriksson <[email protected]> Authored: Thu Nov 26 08:41:49 2015 +0100 Committer: Marcus Eriksson <[email protected]> Committed: Thu Nov 26 08:41:49 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/c2ea8c4f/CHANGES.txt ----------------------------------------------------------------------
