Merge branch 'CASSANDRA-10796' into CASSANDRA-10796-3.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9d1f8d1c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9d1f8d1c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9d1f8d1c Branch: refs/heads/CASSANDRA-10796-3.1 Commit: 9d1f8d1c0c3e6d97abf55c1e6b21be27d00b5db9 Parents: 82d5f6a 90c0d13 Author: Tyler Hobbs <[email protected]> Authored: Wed Dec 2 12:15:57 2015 -0600 Committer: Tyler Hobbs <[email protected]> Committed: Wed Dec 2 12:15:57 2015 -0600 ---------------------------------------------------------------------- .../apache/cassandra/db/rows/AbstractCell.java | 5 +- .../apache/cassandra/db/rows/AbstractRow.java | 7 +- .../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 | 703 +---------------- 8 files changed, 831 insertions(+), 685 deletions(-) ----------------------------------------------------------------------
