Merge branch 'cassandra-2.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1fe9a112 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1fe9a112 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1fe9a112 Branch: refs/heads/trunk Commit: 1fe9a112c6d6eb50adc5351cd36db4c34369cd53 Parents: d5e32da 579eb22 Author: Jonathan Ellis <[email protected]> Authored: Fri Nov 1 19:41:02 2013 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Fri Nov 1 19:41:02 2013 -0500 ---------------------------------------------------------------------- src/java/org/apache/cassandra/db/compaction/CompactionTask.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1fe9a112/src/java/org/apache/cassandra/db/compaction/CompactionTask.java ----------------------------------------------------------------------
