Updated Branches: refs/heads/cassandra-1.1 08848e795 -> a2a28a408 refs/heads/trunk 4d7e70356 -> 6f65c8ca8
merge from 1.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6f65c8ca Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6f65c8ca Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6f65c8ca Branch: refs/heads/trunk Commit: 6f65c8ca80e46c96fca5f7a44852587a4018050c Parents: 4d7e703 a2a28a4 Author: Jonathan Ellis <jbel...@apache.org> Authored: Wed May 9 14:56:54 2012 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Wed May 9 14:56:54 2012 -0500 ---------------------------------------------------------------------- .../db/compaction/LeveledCompactionStrategy.java | 19 +------------- 1 files changed, 2 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/6f65c8ca/src/java/org/apache/cassandra/db/compaction/LeveledCompactionStrategy.java ----------------------------------------------------------------------
