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/99c93158 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/99c93158 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/99c93158 Branch: refs/heads/trunk Commit: 99c93158db7c580e2a84865a02602f6f63e8691d Parents: 78cad84 f19610c Author: Dave Brosius <dbros...@mebigfatguy.com> Authored: Thu Oct 17 21:53:58 2013 -0400 Committer: Dave Brosius <dbros...@mebigfatguy.com> Committed: Thu Oct 17 21:53:58 2013 -0400 ---------------------------------------------------------------------- .../compaction/LeveledCompactionStrategy.java | 33 ++++++-------------- 1 file changed, 10 insertions(+), 23 deletions(-) ----------------------------------------------------------------------
