Updated Branches: refs/heads/trunk 22609801d -> ae87a1f13
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/ae87a1f1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ae87a1f1 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ae87a1f1 Branch: refs/heads/trunk Commit: ae87a1f130155685cbbeab27a36c7dd98f5a7c7b Parents: 2260980 361aca5 Author: Dave Brosius <dbros...@apache.org> Authored: Fri Feb 15 01:37:49 2013 -0500 Committer: Dave Brosius <dbros...@apache.org> Committed: Fri Feb 15 01:37:49 2013 -0500 ---------------------------------------------------------------------- .../cassandra/db/compaction/CompactionTask.java | 49 ++++++++------- 1 files changed, 26 insertions(+), 23 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ae87a1f1/src/java/org/apache/cassandra/db/compaction/CompactionTask.java ----------------------------------------------------------------------
