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/02e9ddfa Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/02e9ddfa Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/02e9ddfa Branch: refs/heads/cassandra-3.11 Commit: 02e9ddfad9babf98d743fedd005e3ca41df8c2eb Parents: 77a1205 b8fb29a Author: Paulo Motta <pauloricard...@gmail.com> Authored: Wed Jun 6 15:37:24 2018 -0300 Committer: Paulo Motta <pauloricard...@gmail.com> Committed: Wed Jun 6 15:37:59 2018 -0300 ---------------------------------------------------------------------- .../org/apache/cassandra/db/SystemKeyspace.java | 2 - .../db/compaction/AntiCompactionTest.java | 13 +- .../db/compaction/CompactionsTest.java | 328 ++++++++----------- 3 files changed, 141 insertions(+), 202 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/02e9ddfa/src/java/org/apache/cassandra/db/SystemKeyspace.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/db/SystemKeyspace.java index ac51662,5f5041c..973538f --- a/src/java/org/apache/cassandra/db/SystemKeyspace.java +++ b/src/java/org/apache/cassandra/db/SystemKeyspace.java @@@ -42,11 -40,8 +42,9 @@@ import org.slf4j.LoggerFactory import com.google.common.util.concurrent.Futures; - import org.apache.cassandra.concurrent.Stage; - import org.apache.cassandra.concurrent.StageManager; import org.apache.cassandra.config.CFMetaData; import org.apache.cassandra.config.DatabaseDescriptor; +import org.apache.cassandra.config.SchemaConstants; import org.apache.cassandra.cql3.QueryProcessor; import org.apache.cassandra.cql3.UntypedResultSet; import org.apache.cassandra.cql3.functions.*; http://git-wip-us.apache.org/repos/asf/cassandra/blob/02e9ddfa/test/unit/org/apache/cassandra/db/compaction/CompactionsTest.java ---------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
