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/ecea0575 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ecea0575 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ecea0575 Branch: refs/heads/trunk Commit: ecea057559b782f78706ac33366a51addaa6a567 Parents: 2c6a5c0 e506651 Author: Jonathan Ellis <jbel...@apache.org> Authored: Tue Oct 29 15:37:36 2013 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Tue Oct 29 15:37:36 2013 -0500 ---------------------------------------------------------------------- .../db/compaction/SizeTieredCompactionStrategy.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ecea0575/src/java/org/apache/cassandra/db/compaction/SizeTieredCompactionStrategy.java ----------------------------------------------------------------------
