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/20813858
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/20813858
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/20813858

Branch: refs/heads/cassandra-3.0
Commit: 20813858297b375e1e3f7f4b09dcba2756f9c58f
Parents: cb21f28 577accd
Author: Sylvain Lebresne <sylv...@datastax.com>
Authored: Wed Feb 3 14:24:54 2016 +0100
Committer: Sylvain Lebresne <sylv...@datastax.com>
Committed: Wed Feb 3 14:24:54 2016 +0100

----------------------------------------------------------------------
 src/java/org/apache/cassandra/db/marshal/SimpleDateType.java | 6 ------
 1 file changed, 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/20813858/src/java/org/apache/cassandra/db/marshal/SimpleDateType.java
----------------------------------------------------------------------

Reply via email to