Updated Branches: refs/heads/cassandra-1.2 b251e7aec -> 82de0ec75 refs/heads/trunk 2dd226875 -> 6d364f4a3
Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6d364f4a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6d364f4a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6d364f4a Branch: refs/heads/trunk Commit: 6d364f4a324fd31f530bb1e91a9c16452ddff581 Parents: 2dd2268 82de0ec Author: Jonathan Ellis <jbel...@apache.org> Authored: Mon Feb 4 17:50:43 2013 +0100 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Mon Feb 4 17:50:43 2013 +0100 ---------------------------------------------------------------------- .../compaction/SizeTieredCompactionStrategy.java | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/6d364f4a/src/java/org/apache/cassandra/db/compaction/SizeTieredCompactionStrategy.java ----------------------------------------------------------------------
