You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@cassandra.apache.org by xe...@apache.org on 2012/03/22 15:09:55 UTC

[2/4] git commit: merge from 1.1.0

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/trunk
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
----------------------------------------------------------------------