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/5ab14968 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5ab14968 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5ab14968 Branch: refs/heads/cassandra-2.2 Commit: 5ab14968ec3819a94d9c3abdeb93a812c4a45b4a Parents: e5a76bd 4362e71 Author: T Jake Luciani <j...@apache.org> Authored: Fri May 22 11:57:36 2015 -0400 Committer: T Jake Luciani <j...@apache.org> Committed: Fri May 22 11:57:36 2015 -0400 ---------------------------------------------------------------------- src/java/org/apache/cassandra/db/compaction/CompactionManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5ab14968/src/java/org/apache/cassandra/db/compaction/CompactionManager.java ----------------------------------------------------------------------
