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/5c59d5af Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5c59d5af Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5c59d5af Branch: refs/heads/trunk Commit: 5c59d5af751058ed86b63db05d5a17c48f4dfa41 Parents: 5a54d9a 1a2c1bc Author: Marcus Eriksson <marc...@apache.org> Authored: Tue Aug 4 09:52:11 2015 +0200 Committer: Marcus Eriksson <marc...@apache.org> Committed: Tue Aug 4 09:52:11 2015 +0200 ---------------------------------------------------------------------- .../db/compaction/CompactionsCQLTest.java | 118 ++++++++++++++++++- 1 file changed, 113 insertions(+), 5 deletions(-) ----------------------------------------------------------------------
