Permalink
Browse files

merge from 1.1

  • Loading branch information...
1 parent ed8e353 commit 76ada1106f6a8306c1f3abd3b334380d4e4818d3 @jbellis jbellis committed Jul 2, 2012
View
8 src/java/org/apache/cassandra/db/ColumnFamilyStore.java
@@ -29,7 +29,10 @@
import java.util.regex.Pattern;
import javax.management.*;
-import com.google.common.collect.*;
+import com.google.common.collect.AbstractIterator;
+import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Iterables;
+import com.google.common.collect.Sets;
import com.google.common.util.concurrent.Futures;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -47,16 +50,15 @@
import org.apache.cassandra.db.compaction.AbstractCompactionStrategy;
import org.apache.cassandra.db.compaction.CompactionManager;
import org.apache.cassandra.db.compaction.LeveledCompactionStrategy;
-import org.apache.cassandra.db.filter.ExtendedFilter;
import org.apache.cassandra.db.compaction.OperationType;
+import org.apache.cassandra.db.filter.ExtendedFilter;
import org.apache.cassandra.db.filter.IFilter;
import org.apache.cassandra.db.filter.QueryFilter;
import org.apache.cassandra.db.filter.QueryPath;
import org.apache.cassandra.db.index.SecondaryIndex;
import org.apache.cassandra.db.index.SecondaryIndexManager;
import org.apache.cassandra.db.marshal.AbstractType;
import org.apache.cassandra.dht.*;
-import org.apache.cassandra.dht.Range;
import org.apache.cassandra.io.compress.CompressionParameters;
import org.apache.cassandra.io.sstable.*;
import org.apache.cassandra.io.sstable.Descriptor;
View
1 src/java/org/apache/cassandra/service/StorageService.java
@@ -34,6 +34,7 @@
import com.google.common.base.Supplier;
import com.google.common.collect.*;
+import org.apache.cassandra.dht.Range;
import org.apache.cassandra.metrics.ClientRequestMetrics;
import org.apache.log4j.Level;
import org.apache.commons.lang.StringUtils;

0 comments on commit 76ada11

Please sign in to comment.