Merge branch 'cassandra-3.3' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/fa1707fa Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fa1707fa Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fa1707fa Branch: refs/heads/trunk Commit: fa1707fa6859d6391ae7a33ca69c634ba12d83e5 Parents: 786d676 91aeb26 Author: Carl Yeksigian <c...@apache.org> Authored: Wed Jan 6 11:49:33 2016 -0500 Committer: Carl Yeksigian <c...@apache.org> Committed: Wed Jan 6 11:49:33 2016 -0500 ---------------------------------------------------------------------- .../apache/cassandra/db/view/TemporalRow.java | 65 ++++++++++++++------ .../org/apache/cassandra/cql3/ViewTest.java | 30 +++++++++ 2 files changed, 76 insertions(+), 19 deletions(-) ----------------------------------------------------------------------
