Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b59da28c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b59da28c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b59da28c Branch: refs/heads/trunk Commit: b59da28c0d7ab97c7014f8c4553e55054ae851ad Parents: 7d7ff7f 3ea34aa Author: Marcus Eriksson <marc...@apache.org> Authored: Thu Feb 11 08:39:31 2016 +0100 Committer: Marcus Eriksson <marc...@apache.org> Committed: Thu Feb 11 08:39:31 2016 +0100 ---------------------------------------------------------------------- .../LeveledCompactionStrategyTest.java | 25 +++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b59da28c/test/unit/org/apache/cassandra/db/compaction/LeveledCompactionStrategyTest.java ----------------------------------------------------------------------
