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/35a7194e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/35a7194e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/35a7194e Branch: refs/heads/trunk Commit: 35a7194e7fc0565768b079f49267b84338f903cb Parents: c5feeda 8cb5a20 Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Wed Feb 3 12:14:16 2016 +0100 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Wed Feb 3 12:14:16 2016 +0100 ---------------------------------------------------------------------- src/java/org/apache/cassandra/db/marshal/DateType.java | 5 +++++ src/java/org/apache/cassandra/db/marshal/TimeType.java | 6 ------ 2 files changed, 5 insertions(+), 6 deletions(-) ----------------------------------------------------------------------