Updated Branches: refs/heads/trunk ad4541e6b -> fe507e305
merge from 1.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/fe507e30 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fe507e30 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fe507e30 Branch: refs/heads/trunk Commit: fe507e3058511cc363e2a94e8370e7306efe45bb Parents: ad4541e df10325 Author: Pavel Yaskevich <[email protected]> Authored: Thu Mar 22 17:08:37 2012 +0300 Committer: Pavel Yaskevich <[email protected]> Committed: Thu Mar 22 17:08:37 2012 +0300 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/db/Directories.java | 32 ++++++++++++--- .../cassandra/db/compaction/CompactionTask.java | 32 ++++++++------- 3 files changed, 44 insertions(+), 21 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/fe507e30/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/fe507e30/src/java/org/apache/cassandra/db/Directories.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/fe507e30/src/java/org/apache/cassandra/db/compaction/CompactionTask.java ----------------------------------------------------------------------
