Merge branch 'cassandra-1.1' into cassandra-1.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/95ff3bb5 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/95ff3bb5 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/95ff3bb5 Branch: refs/heads/trunk Commit: 95ff3bb5b6072b43cabc1e6c87e4a71daf406297 Parents: d7066f4 112014a Author: Dave Brosius <[email protected]> Authored: Sat Apr 13 00:10:14 2013 -0400 Committer: Dave Brosius <[email protected]> Committed: Sat Apr 13 00:10:14 2013 -0400 ---------------------------------------------------------------------- .../db/compaction/LeveledCompactionStrategy.java | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/95ff3bb5/src/java/org/apache/cassandra/db/compaction/LeveledCompactionStrategy.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/db/compaction/LeveledCompactionStrategy.java index 9a73299,38a00f2..b6da891 --- a/src/java/org/apache/cassandra/db/compaction/LeveledCompactionStrategy.java +++ b/src/java/org/apache/cassandra/db/compaction/LeveledCompactionStrategy.java @@@ -42,7 -47,8 +42,9 @@@ import org.apache.cassandra.notificatio public class LeveledCompactionStrategy extends AbstractCompactionStrategy implements INotificationConsumer { private static final Logger logger = LoggerFactory.getLogger(LeveledCompactionStrategy.class); + private static final String SSTABLE_SIZE_OPTION = "sstable_size_in_mb"; + + private static final String SSTABLE_SIZE_OPTION = "sstable_size_in_mb"; @VisibleForTesting final LeveledManifest manifest;
