Updated Branches: refs/heads/cassandra-1.2 fca00acb5 -> 0207bdf5f refs/heads/trunk d3cd9adf9 -> 9bc9853e2
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/9bc9853e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9bc9853e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9bc9853e Branch: refs/heads/trunk Commit: 9bc9853e295df3fc01fa60d0746ea293d651e635 Parents: d3cd9ad 0207bdf Author: Yuki Morishita <[email protected]> Authored: Wed Dec 19 08:57:36 2012 -0600 Committer: Yuki Morishita <[email protected]> Committed: Wed Dec 19 08:57:36 2012 -0600 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../db/compaction/AbstractCompactionIterable.java | 24 +++++++++++++++ .../db/compaction/CompactionIterable.java | 1 + .../cassandra/db/compaction/CompactionTask.java | 4 +- .../db/compaction/ParallelCompactionIterable.java | 1 + 5 files changed, 29 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/9bc9853e/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/9bc9853e/src/java/org/apache/cassandra/db/compaction/CompactionTask.java ----------------------------------------------------------------------
