Updated Branches: refs/heads/cassandra-1.1 1cbbba095 -> 3cc8656f8 refs/heads/cassandra-1.2 18a1a4b93 -> 8d9510ae4 refs/heads/trunk 1eea9227d -> 8201299dc
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/8201299d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8201299d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8201299d Branch: refs/heads/trunk Commit: 8201299dc8091ebbe698a42cbfd7ebe0f76f2692 Parents: 1eea922 8d9510a Author: Yuki Morishita <yu...@apache.org> Authored: Fri Jan 11 12:56:36 2013 -0600 Committer: Yuki Morishita <yu...@apache.org> Committed: Fri Jan 11 12:56:36 2013 -0600 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/cassandra/db/ColumnFamilyStore.java | 35 ++++++++++----- .../cassandra/db/compaction/CompactionTask.java | 33 ++++++++------ 3 files changed, 44 insertions(+), 25 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8201299d/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8201299d/src/java/org/apache/cassandra/db/ColumnFamilyStore.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8201299d/src/java/org/apache/cassandra/db/compaction/CompactionTask.java ----------------------------------------------------------------------
