Updated Branches: refs/heads/cassandra-1.1 86f5eaa9b -> df103258c
merge from 1.1.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/df103258 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/df103258 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/df103258 Branch: refs/heads/cassandra-1.1 Commit: df103258cdd8cd6f0b89a9733936a5ca2fa4cc8c Parents: 86f5eaa b12c34f Author: Pavel Yaskevich <xe...@apache.org> Authored: Thu Mar 22 17:06:31 2012 +0300 Committer: Pavel Yaskevich <xe...@apache.org> Committed: Thu Mar 22 17:06:31 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/df103258/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/df103258/src/java/org/apache/cassandra/db/Directories.java ----------------------------------------------------------------------
