Merge branch 'cassandra-2.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/3e6aa753 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3e6aa753 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3e6aa753 Branch: refs/heads/trunk Commit: 3e6aa753e31ae604f29feb38dd4ce4a13c2d85e2 Parents: ec7206c 072b488 Author: Marcus Eriksson <[email protected]> Authored: Wed Apr 23 21:15:29 2014 +0200 Committer: Marcus Eriksson <[email protected]> Committed: Wed Apr 23 21:15:29 2014 +0200 ---------------------------------------------------------------------- .../db/compaction/CompactionManager.java | 1 - .../org/apache/cassandra/db/CleanupTest.java | 30 ++++++++++++++++++++ 2 files changed, 30 insertions(+), 1 deletion(-) ----------------------------------------------------------------------
