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