Updated Branches: refs/heads/cassandra-1.2 85443ec5c -> 3d9d51780 refs/heads/trunk 61a8259d9 -> 0c0417d02
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/0c0417d0 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0c0417d0 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0c0417d0 Branch: refs/heads/trunk Commit: 0c0417d02d1296a595aaa813016196b3e4e08a77 Parents: 61a8259 3d9d517 Author: Yuki Morishita <yu...@apache.org> Authored: Tue Jan 22 15:31:47 2013 -0600 Committer: Yuki Morishita <yu...@apache.org> Committed: Tue Jan 22 15:31:47 2013 -0600 ---------------------------------------------------------------------- .../db/compaction/AbstractCompactionIterable.java | 11 ++++++----- .../cassandra/db/compaction/CompactionTask.java | 5 +++-- 2 files changed, 9 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0c0417d0/src/java/org/apache/cassandra/db/compaction/CompactionTask.java ----------------------------------------------------------------------
