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/7d2a96ef Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7d2a96ef Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7d2a96ef Branch: refs/heads/trunk Commit: 7d2a96ef67d11dae743a55954712965a7a6ae6a2 Parents: 9acf588 6932bd8 Author: Marcus Eriksson <[email protected]> Authored: Tue Aug 4 09:56:52 2015 +0200 Committer: Marcus Eriksson <[email protected]> Committed: Tue Aug 4 09:56:52 2015 +0200 ---------------------------------------------------------------------- .../db/compaction/CompactionsCQLTest.java | 113 ++++++++++++++++++- 1 file changed, 108 insertions(+), 5 deletions(-) ----------------------------------------------------------------------
