You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@cassandra.apache.org by sl...@apache.org on 2016/02/03 12:14:53 UTC

[10/10] cassandra git commit: Merge branch 'cassandra-3.3' into trunk

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 <sy...@datastax.com>
Authored: Wed Feb 3 12:14:22 2016 +0100
Committer: Sylvain Lebresne <sy...@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(-)
----------------------------------------------------------------------