Merge branch 'cassandra-2.1.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/0b54c4e5 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0b54c4e5 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0b54c4e5 Branch: refs/heads/trunk Commit: 0b54c4e500cb16b493c360d92a2b22b1c119c8a2 Parents: aac8e6c cbe4fd0 Author: Jason Brown <jasobr...@apple.com> Authored: Mon Jul 7 06:34:56 2014 -0700 Committer: Jason Brown <jasobr...@apple.com> Committed: Mon Jul 7 06:34:56 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/0b54c4e5/src/java/org/apache/cassandra/db/compaction/CompactionManager.java ----------------------------------------------------------------------
