Merge branch 'cassandra-3.11' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9ed04da0 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9ed04da0 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9ed04da0 Branch: refs/heads/trunk Commit: 9ed04da0c606a17b5567c8655f34d8f73d22b18f Parents: c794d2b ab1310b Author: Stefania Alborghetti <[email protected]> Authored: Fri Apr 7 08:48:43 2017 +0800 Committer: Stefania Alborghetti <[email protected]> Committed: Fri Apr 7 08:48:43 2017 +0800 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../apache/cassandra/schema/SchemaKeyspace.java | 23 +++++++++++++++----- 2 files changed, 18 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/9ed04da0/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/9ed04da0/src/java/org/apache/cassandra/schema/SchemaKeyspace.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/schema/SchemaKeyspace.java index 47684ba,2c2416e..d2aa7e1 --- a/src/java/org/apache/cassandra/schema/SchemaKeyspace.java +++ b/src/java/org/apache/cassandra/schema/SchemaKeyspace.java @@@ -23,10 -23,9 +23,8 @@@ import java.security.MessageDigest import java.security.NoSuchAlgorithmException; import java.util.*; import java.util.concurrent.TimeUnit; -import java.util.stream.Collectors; - import com.google.common.collect.ImmutableList; - import com.google.common.collect.ImmutableSet; - import com.google.common.collect.MapDifference; + import com.google.common.collect.*; import com.google.common.collect.Maps; import org.slf4j.Logger; import org.slf4j.LoggerFactory;
