Merge branch 'cassandra-2.1' into trunk
Conflicts:
src/java/org/apache/cassandra/db/index/SecondaryIndex.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/07068e20
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/07068e20
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/07068e20
Branch: refs/heads/trunk
Commit: 07068e204df0f6b49eaef3034d4782f10a9d6fe1
Parents: 525ac00 2d4a305
Author: Tyler Hobbs <[email protected]>
Authored: Tue Nov 4 12:03:35 2014 -0600
Committer: Tyler Hobbs <[email protected]>
Committed: Tue Nov 4 12:03:35 2014 -0600
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../db/index/AbstractSimplePerColumnSecondaryIndex.java | 5 +++++
.../apache/cassandra/db/index/PerColumnSecondaryIndex.java | 7 ++++++-
src/java/org/apache/cassandra/db/index/SecondaryIndex.java | 7 +++++++
.../apache/cassandra/db/index/SecondaryIndexManager.java | 4 ++--
.../db/index/composites/CompositesIndexOnClusteringKey.java | 9 +++++++++
.../db/index/composites/CompositesIndexOnPartitionKey.java | 9 +++++++++
test/unit/org/apache/cassandra/db/RangeTombstoneTest.java | 3 +++
.../org/apache/cassandra/db/SecondaryIndexCellSizeTest.java | 3 +++
9 files changed, 45 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/07068e20/CHANGES.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/07068e20/src/java/org/apache/cassandra/db/index/SecondaryIndex.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/db/index/SecondaryIndex.java
index b52b6a2,044912f..2717e08
--- a/src/java/org/apache/cassandra/db/index/SecondaryIndex.java
+++ b/src/java/org/apache/cassandra/db/index/SecondaryIndex.java
@@@ -26,7 -26,7 +26,8 @@@ import java.util.concurrent.ConcurrentH
import java.util.concurrent.Future;
import java.util.concurrent.FutureTask;
+import org.apache.cassandra.io.sstable.format.SSTableReader;
+ import com.google.common.base.Objects;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/07068e20/src/java/org/apache/cassandra/db/index/SecondaryIndexManager.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/07068e20/test/unit/org/apache/cassandra/db/RangeTombstoneTest.java
----------------------------------------------------------------------
