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/f1f52e7b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f1f52e7b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f1f52e7b Branch: refs/heads/trunk Commit: f1f52e7bb88116e440582090cfce615511716f49 Parents: eef0ddf 35a7194 Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Wed Feb 3 12:14:22 2016 +0100 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Wed Feb 3 12:14:22 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(-) ----------------------------------------------------------------------