Updated Branches: refs/heads/cassandra-1.2 f25284220 -> 4e3d04915 refs/heads/trunk 1e80bb899 -> dd14505f1
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/dd14505f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/dd14505f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/dd14505f Branch: refs/heads/trunk Commit: dd14505f150c5543cf6853f71b93aef8817dd7b1 Parents: 1e80bb8 4e3d049 Author: Jonathan Ellis <[email protected]> Authored: Wed Dec 19 16:54:50 2012 -0600 Committer: Jonathan Ellis <[email protected]> Committed: Wed Dec 19 16:54:50 2012 -0600 ---------------------------------------------------------------------- .../db/compaction/CompactionIterable.java | 15 +++------- .../cassandra/db/compaction/CompactionTask.java | 15 ++++++---- .../db/compaction/ParallelCompactionIterable.java | 22 +-------------- .../cassandra/db/compaction/PrecompactedRow.java | 2 - 4 files changed, 14 insertions(+), 40 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/dd14505f/src/java/org/apache/cassandra/db/compaction/CompactionTask.java ----------------------------------------------------------------------
