Merge branch 'cassandra-2.1' into trunk
Conflicts:
test/unit/org/apache/cassandra/db/RangeTombstoneTest.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/84623352
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/84623352
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/84623352
Branch: refs/heads/trunk
Commit: 8462335262f92ce824e77eda292692567158ed5e
Parents: 125f19a fdf293d
Author: Marcus Eriksson <marc...@apache.org>
Authored: Tue Aug 26 15:39:20 2014 +0200
Committer: Marcus Eriksson <marc...@apache.org>
Committed: Tue Aug 26 15:39:20 2014 +0200
----------------------------------------------------------------------
CHANGES.txt | 3 ++
.../cql3/statements/SelectStatement.java | 5 ++
.../db/compaction/LazilyCompactedRow.java | 7 +--
.../apache/cassandra/db/RangeTombstoneTest.java | 56 ++++++++++++++++++++
4 files changed, 68 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/84623352/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index a0ff1d1,fd73626..425d72a
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -72,7 -52,12 +72,9 @@@ Merged from 1.2
values (CASSANDRA-7792)
* Fix ordering of static cells (CASSANDRA-7763)
Merged from 2.0:
+ * Always reject inequality on the partition key without token()
+ (CASSANDRA-7722)
* Always send Paxos commit to all replicas (CASSANDRA-7479)
- * Don't send schema change responses and events for no-op DDL
- statements (CASSANDRA-7600)
- * (Hadoop) fix cluster initialisation for a split fetching (CASSANDRA-7774)
* Configure system.paxos with LeveledCompactionStrategy (CASSANDRA-7753)
* Fix ALTER clustering column type from DateType to TimestampType when
using DESC clustering order (CASSANRDA-7797)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/84623352/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/84623352/test/unit/org/apache/cassandra/db/RangeTombstoneTest.java
----------------------------------------------------------------------
diff --cc test/unit/org/apache/cassandra/db/RangeTombstoneTest.java
index d1d3c46,ecf06d3..9dddf31
--- a/test/unit/org/apache/cassandra/db/RangeTombstoneTest.java
+++ b/test/unit/org/apache/cassandra/db/RangeTombstoneTest.java
@@@ -32,7 -33,10 +34,8 @@@ import org.junit.BeforeClass
import org.junit.Test;
import org.apache.cassandra.SchemaLoader;
+import org.apache.cassandra.config.*;
+ import org.apache.cassandra.Util;
-import org.apache.cassandra.config.ColumnDefinition;
-import org.apache.cassandra.config.DatabaseDescriptor;
-import org.apache.cassandra.config.IndexType;
import org.apache.cassandra.db.columniterator.OnDiskAtomIterator;
import org.apache.cassandra.db.compaction.CompactionManager;
import org.apache.cassandra.db.compaction.SizeTieredCompactionStrategy;
