Merge branch 'cassandra-3.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/55b6e8a0 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/55b6e8a0 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/55b6e8a0 Branch: refs/heads/trunk Commit: 55b6e8a072cd0b87d7648ec02a22a03cb53aba34 Parents: c18ab38 9f0509e Author: Marcus Eriksson <marc...@apache.org> Authored: Thu Sep 10 14:41:52 2015 +0200 Committer: Marcus Eriksson <marc...@apache.org> Committed: Thu Sep 10 14:41:52 2015 +0200 ---------------------------------------------------------------------- .../db/compaction/CompactionManager.java | 28 +++++++++++++------- .../db/compaction/AntiCompactionTest.java | 4 +-- 2 files changed, 20 insertions(+), 12 deletions(-) ----------------------------------------------------------------------
