Merge branch 'cassandra-3.0' into cassandra-3.3
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/91aeb263 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/91aeb263 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/91aeb263 Branch: refs/heads/trunk Commit: 91aeb2637ebec72992de67e02f48d3597b15219f Parents: 7fbc39b 70c08ec Author: Carl Yeksigian <c...@apache.org> Authored: Wed Jan 6 10:43:35 2016 -0500 Committer: Carl Yeksigian <c...@apache.org> Committed: Wed Jan 6 10:43:35 2016 -0500 ---------------------------------------------------------------------- .../apache/cassandra/db/view/TemporalRow.java | 65 ++++++++++++++------ .../org/apache/cassandra/cql3/ViewTest.java | 30 +++++++++ 2 files changed, 76 insertions(+), 19 deletions(-) ----------------------------------------------------------------------
