Merge branch 'cassandra-2.0.0' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/857a7f5f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/857a7f5f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/857a7f5f Branch: refs/heads/cassandra-2.0 Commit: 857a7f5fb8246aa2d588c3ff257109b14f35be2f Parents: c4f6be8 8f367fd Author: Marcus Eriksson <marc...@spotify.com> Authored: Wed Aug 21 14:52:25 2013 +0200 Committer: Marcus Eriksson <marc...@spotify.com> Committed: Wed Aug 21 14:52:25 2013 +0200 ---------------------------------------------------------------------- .../apache/cassandra/db/compaction/LeveledCompactionStrategy.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/857a7f5f/src/java/org/apache/cassandra/db/compaction/LeveledCompactionStrategy.java ----------------------------------------------------------------------
