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/0ae5def8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0ae5def8 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0ae5def8 Branch: refs/heads/trunk Commit: 0ae5def831858e3ecba3aa5d510bc2575f4b5ba3 Parents: 968810e 0b54c4e Author: Jason Brown <[email protected]> Authored: Mon Jul 7 06:35:25 2014 -0700 Committer: Jason Brown <[email protected]> Committed: Mon Jul 7 06:35:25 2014 -0700 ---------------------------------------------------------------------- .../org/apache/cassandra/db/compaction/CompactionManager.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0ae5def8/src/java/org/apache/cassandra/db/compaction/CompactionManager.java ----------------------------------------------------------------------
