Merge branch 'cassandra-3.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4effabc8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4effabc8 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4effabc8 Branch: refs/heads/trunk Commit: 4effabc8fe842224cd8e2a846274b617d2b4a9e6 Parents: 65000b3 18e2fca Author: Aleksey Yeschenko <alek...@apache.org> Authored: Thu Nov 5 11:20:06 2015 +0000 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Thu Nov 5 11:20:06 2015 +0000 ---------------------------------------------------------------------- .../org/apache/cassandra/cql3/CQL3Type.java | 22 +++++++++++++++++--- .../apache/cassandra/schema/CQLTypeParser.java | 2 +- src/java/org/apache/cassandra/schema/Types.java | 2 +- 3 files changed, 21 insertions(+), 5 deletions(-) ----------------------------------------------------------------------