You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sa...@apache.org on 2015/09/19 12:54:58 UTC
[1/3] cassandra git commit: Ninja remove unused imports
Repository: cassandra
Updated Branches:
refs/heads/cassandra-3.0 e25453ba5 -> 41731b84f
refs/heads/trunk fe15e6c3c -> c21a2b758
Ninja remove unused imports
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/41731b84
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/41731b84
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/41731b84
Branch: refs/heads/cassandra-3.0
Commit: 41731b84fd51bcd6bf1cb17ea22eaa6877df23a0
Parents: e25453b
Author: Sam Tunnicliffe <sa...@beobal.com>
Authored: Sat Sep 19 11:53:13 2015 +0100
Committer: Sam Tunnicliffe <sa...@beobal.com>
Committed: Sat Sep 19 11:53:13 2015 +0100
----------------------------------------------------------------------
.../org/apache/cassandra/schema/CompressionParams.java | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/41731b84/src/java/org/apache/cassandra/schema/CompressionParams.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/schema/CompressionParams.java b/src/java/org/apache/cassandra/schema/CompressionParams.java
index 443b6f1..7f46718 100644
--- a/src/java/org/apache/cassandra/schema/CompressionParams.java
+++ b/src/java/org/apache/cassandra/schema/CompressionParams.java
@@ -20,18 +20,16 @@ package org.apache.cassandra.schema;
import java.io.IOException;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
-import java.util.*;
-import java.util.concurrent.TimeUnit;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Sets;
import org.apache.commons.lang3.builder.EqualsBuilder;
import org.apache.commons.lang3.builder.HashCodeBuilder;
-import org.slf4j.LoggerFactory;
import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
-import org.apache.cassandra.config.CFMetaData;
import org.apache.cassandra.config.ParameterizedClass;
import org.apache.cassandra.db.TypeSizes;
import org.apache.cassandra.exceptions.ConfigurationException;
@@ -39,8 +37,6 @@ import org.apache.cassandra.io.IVersionedSerializer;
import org.apache.cassandra.io.compress.*;
import org.apache.cassandra.io.util.DataInputPlus;
import org.apache.cassandra.io.util.DataOutputPlus;
-import org.apache.cassandra.service.ClientWarn;
-import org.apache.cassandra.utils.NoSpamLogger;
import static java.lang.String.format;
[3/3] cassandra git commit: Merge branch 'cassandra-3.0' into trunk
Posted by sa...@apache.org.
Merge branch 'cassandra-3.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c21a2b75
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c21a2b75
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c21a2b75
Branch: refs/heads/trunk
Commit: c21a2b758ba36afe8fc591b0b28be300f5868548
Parents: fe15e6c 41731b8
Author: Sam Tunnicliffe <sa...@beobal.com>
Authored: Sat Sep 19 11:54:15 2015 +0100
Committer: Sam Tunnicliffe <sa...@beobal.com>
Committed: Sat Sep 19 11:54:15 2015 +0100
----------------------------------------------------------------------
.../org/apache/cassandra/schema/CompressionParams.java | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
[2/3] cassandra git commit: Ninja remove unused imports
Posted by sa...@apache.org.
Ninja remove unused imports
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/41731b84
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/41731b84
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/41731b84
Branch: refs/heads/trunk
Commit: 41731b84fd51bcd6bf1cb17ea22eaa6877df23a0
Parents: e25453b
Author: Sam Tunnicliffe <sa...@beobal.com>
Authored: Sat Sep 19 11:53:13 2015 +0100
Committer: Sam Tunnicliffe <sa...@beobal.com>
Committed: Sat Sep 19 11:53:13 2015 +0100
----------------------------------------------------------------------
.../org/apache/cassandra/schema/CompressionParams.java | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/41731b84/src/java/org/apache/cassandra/schema/CompressionParams.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/schema/CompressionParams.java b/src/java/org/apache/cassandra/schema/CompressionParams.java
index 443b6f1..7f46718 100644
--- a/src/java/org/apache/cassandra/schema/CompressionParams.java
+++ b/src/java/org/apache/cassandra/schema/CompressionParams.java
@@ -20,18 +20,16 @@ package org.apache.cassandra.schema;
import java.io.IOException;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
-import java.util.*;
-import java.util.concurrent.TimeUnit;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Sets;
import org.apache.commons.lang3.builder.EqualsBuilder;
import org.apache.commons.lang3.builder.HashCodeBuilder;
-import org.slf4j.LoggerFactory;
import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
-import org.apache.cassandra.config.CFMetaData;
import org.apache.cassandra.config.ParameterizedClass;
import org.apache.cassandra.db.TypeSizes;
import org.apache.cassandra.exceptions.ConfigurationException;
@@ -39,8 +37,6 @@ import org.apache.cassandra.io.IVersionedSerializer;
import org.apache.cassandra.io.compress.*;
import org.apache.cassandra.io.util.DataInputPlus;
import org.apache.cassandra.io.util.DataOutputPlus;
-import org.apache.cassandra.service.ClientWarn;
-import org.apache.cassandra.utils.NoSpamLogger;
import static java.lang.String.format;