Merge branch 'cassandra-3.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6c9c0911 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6c9c0911 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6c9c0911 Branch: refs/heads/trunk Commit: 6c9c0911852c6d198c52d89d1fdb7da8036ef44d Parents: 0ff8ab0 dbc40b1 Author: Josh McKenzie <jmcken...@apache.org> Authored: Fri Jun 17 12:50:24 2016 -0400 Committer: Josh McKenzie <jmcken...@apache.org> Committed: Fri Jun 17 12:50:24 2016 -0400 ---------------------------------------------------------------------- test/unit/org/apache/cassandra/db/marshal/TimeTypeTest.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ----------------------------------------------------------------------
