Merge branch 'cassandra-2.2' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c2e54ddc Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c2e54ddc Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c2e54ddc Branch: refs/heads/trunk Commit: c2e54ddc3f47912814323dcc4fca45300db2c518 Parents: 8c19fd6 271c9e4 Author: Marcus Eriksson <marc...@apache.org> Authored: Fri Jun 12 18:52:05 2015 +0200 Committer: Marcus Eriksson <marc...@apache.org> Committed: Fri Jun 12 18:52:05 2015 +0200 ---------------------------------------------------------------------- .../apache/cassandra/db/compaction/CompactionController.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) ----------------------------------------------------------------------
