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/60a2d97a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/60a2d97a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/60a2d97a Branch: refs/heads/cassandra-3.11 Commit: 60a2d97a63c151c3f76791775d6ab09d97c74b54 Parents: cb2a1c8 9882cd8 Author: Stefania Alborghetti <stefania.alborghe...@datastax.com> Authored: Wed Sep 13 16:46:49 2017 +0800 Committer: Stefania Alborghetti <stefania.alborghe...@datastax.com> Committed: Wed Sep 13 16:46:49 2017 +0800 ---------------------------------------------------------------------- .../apache/cassandra/io/sstable/IndexSummaryTest.java | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/60a2d97a/test/unit/org/apache/cassandra/io/sstable/IndexSummaryTest.java ---------------------------------------------------------------------- diff --cc test/unit/org/apache/cassandra/io/sstable/IndexSummaryTest.java index ab0486d,6f37d8f..d83b96c --- a/test/unit/org/apache/cassandra/io/sstable/IndexSummaryTest.java +++ b/test/unit/org/apache/cassandra/io/sstable/IndexSummaryTest.java @@@ -26,9 -26,9 +26,10 @@@ import java.util.* import com.google.common.collect.Lists; import org.junit.BeforeClass; import org.junit.Test; + import org.junit.Assume; import org.apache.cassandra.Util; +import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.db.*; import org.apache.cassandra.dht.IPartitioner; import org.apache.cassandra.dht.RandomPartitioner; --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
