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/984e174d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/984e174d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/984e174d Branch: refs/heads/cassandra-3.0 Commit: 984e174dea689f510b24df6ec32581147e96613f Parents: b59da28 393c6ec Author: Marcus Eriksson <[email protected]> Authored: Thu Feb 11 08:57:13 2016 +0100 Committer: Marcus Eriksson <[email protected]> Committed: Thu Feb 11 08:57:13 2016 +0100 ---------------------------------------------------------------------- .../db/compaction/CompactionsCQLTest.java | 48 ++++++++++---------- 1 file changed, 24 insertions(+), 24 deletions(-) ----------------------------------------------------------------------
