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/b48d71cc Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b48d71cc Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b48d71cc Branch: refs/heads/trunk Commit: b48d71cc67b6fc950ba6fe57a315e504b1eef9ee Parents: c35484a 97e8953 Author: Benjamin Lerer <[email protected]> Authored: Fri Jan 15 11:17:41 2016 +0100 Committer: Benjamin Lerer <[email protected]> Committed: Fri Jan 15 11:18:07 2016 +0100 ---------------------------------------------------------------------- src/java/org/apache/cassandra/db/view/TemporalRow.java | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) ----------------------------------------------------------------------
