Merge branch 'cassandra-2.0' into trunk

Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/bbf3cc51
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bbf3cc51
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bbf3cc51

Branch: refs/heads/trunk
Commit: bbf3cc5166a8279db851090e64997ffc00cb8f15
Parents: 6dda6f2 8dfd75d
Author: Marcus Eriksson <marc...@spotify.com>
Authored: Fri Oct 4 09:42:13 2013 +0200
Committer: Marcus Eriksson <marc...@spotify.com>
Committed: Fri Oct 4 09:42:13 2013 +0200

----------------------------------------------------------------------
 CHANGES.txt                                     |  1 +
 .../db/compaction/LeveledManifest.java          |  4 ++
 .../org/apache/cassandra/io/util/FileUtils.java | 57 ++++++++++++++++----
 .../utils/BackgroundActivityMonitor.java        | 10 +---
 .../org/apache/cassandra/utils/CLibrary.java    |  2 -
 .../org/apache/cassandra/utils/FBUtilities.java |  7 +++
 6 files changed, 62 insertions(+), 19 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/bbf3cc51/CHANGES.txt
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/bbf3cc51/src/java/org/apache/cassandra/db/compaction/LeveledManifest.java
----------------------------------------------------------------------

Reply via email to