Merge branch 'cassandra-1.1' into cassandra-1.2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/08cc800b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/08cc800b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/08cc800b Branch: refs/heads/cassandra-1.2.0 Commit: 08cc800ba41005c74401f2744bc7c89e80fc2cd1 Parents: 2f1ffcc e792187 Author: Jonathan Ellis <[email protected]> Authored: Tue Dec 18 20:47:49 2012 -0600 Committer: Jonathan Ellis <[email protected]> Committed: Tue Dec 18 20:47:49 2012 -0600 ---------------------------------------------------------------------- .../db/compaction/ParallelCompactionIterable.java | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/08cc800b/src/java/org/apache/cassandra/db/compaction/ParallelCompactionIterable.java ----------------------------------------------------------------------
