Updated Branches: refs/heads/cassandra-1.2 d6a3845a2 -> 1d96e32b8 refs/heads/trunk d07735648 -> 04ade2ffa
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/04ade2ff Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/04ade2ff Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/04ade2ff Branch: refs/heads/trunk Commit: 04ade2ffa8750d53bf4694587ed6b83697f94bda Parents: d077356 1d96e32 Author: Jonathan Ellis <[email protected]> Authored: Fri Dec 28 12:02:19 2012 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Fri Dec 28 12:02:19 2012 -0500 ---------------------------------------------------------------------- .../cassandra/db/compaction/CompactionTask.java | 30 ++++++++++----- 1 files changed, 20 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/04ade2ff/src/java/org/apache/cassandra/db/compaction/CompactionTask.java ----------------------------------------------------------------------
