Updated Branches: refs/heads/cassandra-1.1 efba67888 -> 867478493 refs/heads/trunk 086c06ad7 -> 76ada1106
merge from 1.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/76ada110 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/76ada110 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/76ada110 Branch: refs/heads/trunk Commit: 76ada1106f6a8306c1f3abd3b334380d4e4818d3 Parents: ed8e353 Author: Jonathan Ellis <[email protected]> Authored: Mon Jul 2 13:32:00 2012 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Mon Jul 2 13:32:00 2012 -0500 ---------------------------------------------------------------------- .../org/apache/cassandra/db/ColumnFamilyStore.java | 8 +++++--- .../apache/cassandra/service/StorageService.java | 1 + 2 files changed, 6 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/76ada110/src/java/org/apache/cassandra/db/ColumnFamilyStore.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java index 6d46f9e..6496278 100644 --- a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java +++ b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java @@ -29,7 +29,10 @@ import java.util.concurrent.atomic.AtomicLong; 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,8 +50,8 @@ import org.apache.cassandra.db.commitlog.ReplayPosition; 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; @@ -56,7 +59,6 @@ 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; http://git-wip-us.apache.org/repos/asf/cassandra/blob/76ada110/src/java/org/apache/cassandra/service/StorageService.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/service/StorageService.java b/src/java/org/apache/cassandra/service/StorageService.java index 94506e0..fba8d44 100644 --- a/src/java/org/apache/cassandra/service/StorageService.java +++ b/src/java/org/apache/cassandra/service/StorageService.java @@ -34,6 +34,7 @@ import javax.management.ObjectName; 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;
