Merge branch 'cassandra-2.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/d3e77870 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d3e77870 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d3e77870 Branch: refs/heads/trunk Commit: d3e7787064d1ac833541b7c5529912e1c1307b99 Parents: a44ee2a db9ef0b Author: Sylvain Lebresne <[email protected]> Authored: Tue May 20 18:30:06 2014 +0200 Committer: Sylvain Lebresne <[email protected]> Committed: Tue May 20 18:30:06 2014 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + doc/native_protocol_v3.spec | 9 +- .../org/apache/cassandra/config/CFMetaData.java | 4 +- .../org/apache/cassandra/config/UTMetaData.java | 16 +- .../org/apache/cassandra/cql3/UserTypes.java | 21 ++- .../cql3/statements/AlterTypeStatement.java | 26 +-- .../cql3/statements/CreateTypeStatement.java | 8 +- .../cql3/statements/DropTypeStatement.java | 19 +- .../cassandra/cql3/statements/Selection.java | 10 +- .../apache/cassandra/db/marshal/UserType.java | 175 +++++++++++++++++-- .../apache/cassandra/transport/DataType.java | 14 +- 11 files changed, 230 insertions(+), 73 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d3e77870/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d3e77870/src/java/org/apache/cassandra/config/CFMetaData.java ----------------------------------------------------------------------
