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/6679b085 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6679b085 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6679b085 Branch: refs/heads/cassandra-3.11 Commit: 6679b085a3798234881fb64fc6202dc35bf06ec1 Parents: 2369faa 8dbf808 Author: Marcus Eriksson <marc...@apache.org> Authored: Wed Apr 26 09:39:41 2017 +0200 Committer: Marcus Eriksson <marc...@apache.org> Committed: Wed Apr 26 09:39:41 2017 +0200 ---------------------------------------------------------------------- test/unit/org/apache/cassandra/db/compaction/NeverPurgeTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ----------------------------------------------------------------------
