Merge branch 'cassandra-3.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/811ffa7b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/811ffa7b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/811ffa7b Branch: refs/heads/trunk Commit: 811ffa7bffb3ab6c775660484119443105425f76 Parents: 24f842a b7ead2b Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Thu Nov 26 10:43:07 2015 +0100 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Thu Nov 26 10:43:07 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/811ffa7b/CHANGES.txt ----------------------------------------------------------------------