Merge branch 'cassandra-3.0' into cassandra-3.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b7ead2b3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b7ead2b3 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b7ead2b3 Branch: refs/heads/cassandra-3.1 Commit: b7ead2b330e8b3b3a70eaf36895fb1b7f1c6f1b2 Parents: 5fd65f3 64a3bfd Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Thu Nov 26 10:42:50 2015 +0100 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Thu Nov 26 10:42:50 2015 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/cql3/CQL3Type.java | 2 ++ 2 files changed, 3 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b7ead2b3/CHANGES.txt ----------------------------------------------------------------------