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/c7782f2d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c7782f2d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c7782f2d Branch: refs/heads/trunk Commit: c7782f2de044ce18db3441ea27e90d60df531e3f Parents: 6618208 c526131 Author: Jonathan Ellis <[email protected]> Authored: Thu Aug 8 11:33:47 2013 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Thu Aug 8 11:33:47 2013 -0500 ---------------------------------------------------------------------- .../db/compaction/LeveledCompactionStrategy.java | 13 +++++-------- .../org/apache/cassandra/io/sstable/SSTableReader.java | 2 +- src/java/org/apache/cassandra/utils/BiMultiValMap.java | 2 +- src/java/org/apache/cassandra/utils/SlabAllocator.java | 8 ++++---- 4 files changed, 11 insertions(+), 14 deletions(-) ----------------------------------------------------------------------
