Merge branch 'cassandra-2.2' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/288ffca7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/288ffca7 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/288ffca7 Branch: refs/heads/trunk Commit: 288ffca7320c11f5603c71a58f503e3bd8e324ee Parents: 00a34c7 afc5093 Author: Tyler Hobbs <tylerlho...@gmail.com> Authored: Fri Jun 26 12:31:15 2015 -0500 Committer: Tyler Hobbs <tylerlho...@gmail.com> Committed: Fri Jun 26 12:31:15 2015 -0500 ---------------------------------------------------------------------- CHANGES.txt | 2 ++ .../apache/cassandra/db/marshal/TupleType.java | 6 ++++- .../cql3/validation/entities/TupleTypeTest.java | 27 +++++++++++++++++++- 3 files changed, 33 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/288ffca7/CHANGES.txt ----------------------------------------------------------------------
