Merge branch 'cassandra-3.0' into cassandra-3.11
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/88627598 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/88627598 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/88627598 Branch: refs/heads/cassandra-3.11 Commit: 88627598cb8c4bf0af6ed81e5083df2cfe67ca9d Parents: 81b8895 ac1b7c1 Author: Marcus Eriksson <marc...@apache.org> Authored: Mon Apr 3 08:34:02 2017 +0200 Committer: Marcus Eriksson <marc...@apache.org> Committed: Mon Apr 3 08:34:02 2017 +0200 ---------------------------------------------------------------------- .../org/apache/cassandra/db/compaction/CompactionsCQLTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/88627598/test/unit/org/apache/cassandra/db/compaction/CompactionsCQLTest.java ----------------------------------------------------------------------
