Merge branch 'cassandra-3.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/559280bf Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/559280bf Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/559280bf Branch: refs/heads/trunk Commit: 559280bf1b3e8a3e2a04380119963fc5d52bbe7e Parents: 11de522 11bfd19 Author: Marcus Eriksson <[email protected]> Authored: Thu Feb 11 09:03:24 2016 +0100 Committer: Marcus Eriksson <[email protected]> Committed: Thu Feb 11 09:03:24 2016 +0100 ---------------------------------------------------------------------- .../db/compaction/CompactionsCQLTest.java | 53 +++++++++----------- 1 file changed, 25 insertions(+), 28 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/559280bf/test/unit/org/apache/cassandra/db/compaction/CompactionsCQLTest.java ----------------------------------------------------------------------
