Merge branch 'cassandra-1.2' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a1c7c132 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a1c7c132 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a1c7c132 Branch: refs/heads/trunk Commit: a1c7c13214aa3552f4b0ae784973274450ec23d5 Parents: 3c7baf3 a89b219 Author: Dave Brosius <dbros...@apache.org> Authored: Fri Apr 19 00:56:39 2013 -0400 Committer: Dave Brosius <dbros...@apache.org> Committed: Fri Apr 19 00:56:39 2013 -0400 ---------------------------------------------------------------------- .../db/compaction/ParallelCompactionIterable.java | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a1c7c132/src/java/org/apache/cassandra/db/compaction/ParallelCompactionIterable.java ----------------------------------------------------------------------
