Merge branch 'cassandra-3.0' into cassandra-3.1
Conflicts:
CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f0d45ea3
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f0d45ea3
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f0d45ea3
Branch: refs/heads/trunk
Commit: f0d45ea378ce010c2a5f807cd560c540a1d4ae46
Parents: d1a596a 83f8ccc
Author: Tyler Hobbs <tylerlho...@gmail.com>
Authored: Fri Dec 4 11:43:22 2015 -0600
Committer: Tyler Hobbs <tylerlho...@gmail.com>
Committed: Fri Dec 4 11:43:22 2015 -0600
----------------------------------------------------------------------
CHANGES.txt | 2 +
.../apache/cassandra/db/rows/AbstractCell.java | 5 +-
.../apache/cassandra/db/rows/AbstractRow.java | 6 +-
.../apache/cassandra/db/view/TemporalRow.java | 6 +-
src/java/org/apache/cassandra/db/view/View.java | 15 +-
.../apache/cassandra/db/view/ViewManager.java | 4 +
.../apache/cassandra/service/StorageProxy.java | 14 +-
.../apache/cassandra/cql3/ViewSchemaTest.java | 762 +++++++++++++++++++
.../org/apache/cassandra/cql3/ViewTest.java | 707 +----------------
9 files changed, 838 insertions(+), 683 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f0d45ea3/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 87d2e82,c22d138..7c7e301
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,5 -1,6 +1,7 @@@
-3.0.1
+3.1
+Merged from 3.0:
+ * Handle single-column deletions correction in materialized views
+ when the column is part of the view primary key (CASSANDRA-10796)
* Fix issue with datadir migration on upgrade (CASSANDRA-10788)
* Fix bug with range tombstones on reverse queries and test coverage for
AbstractBTreePartition (CASSANDRA-10059)
