Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/271c9e4a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/271c9e4a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/271c9e4a Branch: refs/heads/cassandra-2.2 Commit: 271c9e4ac7a71252e4f4f1984fd4f8f16058bcde Parents: b61da9b 69b7dd3 Author: Marcus Eriksson <marc...@apache.org> Authored: Fri Jun 12 18:51:48 2015 +0200 Committer: Marcus Eriksson <marc...@apache.org> Committed: Fri Jun 12 18:51:48 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/271c9e4a/src/java/org/apache/cassandra/db/compaction/CompactionController.java ----------------------------------------------------------------------
