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/21b134c2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/21b134c2 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/21b134c2 Branch: refs/heads/trunk Commit: 21b134c2ef74b5c6d9413ae1b93c58c855e6911c Parents: e75ebc4 e6f23e6 Author: Robert Stupp <[email protected]> Authored: Fri Sep 18 09:52:21 2015 +0200 Committer: Robert Stupp <[email protected]> Committed: Fri Sep 18 09:52:21 2015 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../cql3/statements/AlterTypeStatement.java | 6 ++- .../cassandra/db/marshal/AbstractType.java | 8 ++++ .../cassandra/db/marshal/CompositeType.java | 11 +++++ .../apache/cassandra/db/marshal/ListType.java | 6 +++ .../apache/cassandra/db/marshal/MapType.java | 6 +++ .../cassandra/db/marshal/ReversedType.java | 5 ++ .../apache/cassandra/db/marshal/SetType.java | 6 +++ .../apache/cassandra/db/marshal/TupleType.java | 11 +++++ .../cql3/validation/entities/UserTypesTest.java | 49 ++++++++++++++++++++ 10 files changed, 108 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/21b134c2/CHANGES.txt ----------------------------------------------------------------------
