Merge branch 'cassandra-2.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/69b7dd32 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/69b7dd32 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/69b7dd32 Branch: refs/heads/cassandra-2.1 Commit: 69b7dd327443239b70a104dfe960bd0aa2ccf0a5 Parents: 16665ee 9e60611 Author: Marcus Eriksson <marc...@apache.org> Authored: Fri Jun 12 18:51:39 2015 +0200 Committer: Marcus Eriksson <marc...@apache.org> Committed: Fri Jun 12 18:51:39 2015 +0200 ---------------------------------------------------------------------- .../apache/cassandra/db/compaction/CompactionController.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/69b7dd32/src/java/org/apache/cassandra/db/compaction/CompactionController.java ----------------------------------------------------------------------
