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/7dec15ba Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7dec15ba Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7dec15ba Branch: refs/heads/trunk Commit: 7dec15bab99c674d8fed41025cb81bb4961376b0 Parents: 8a62046 b44683c Author: Aleksey Yeschenko <alek...@apache.org> Authored: Wed Jan 29 16:31:12 2014 -0600 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Wed Jan 29 16:31:12 2014 -0600 ---------------------------------------------------------------------- .../db/compaction/LeveledCompactionStrategy.java | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/7dec15ba/src/java/org/apache/cassandra/db/compaction/LeveledCompactionStrategy.java ----------------------------------------------------------------------
