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/f7fab28e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f7fab28e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f7fab28e Branch: refs/heads/trunk Commit: f7fab28ecb235faf2ba807720cdca091be7461d0 Parents: 740bcb5 40a1cd3 Author: Sylvain Lebresne <[email protected]> Authored: Wed Aug 6 11:11:37 2014 +0200 Committer: Sylvain Lebresne <[email protected]> Committed: Wed Aug 6 11:11:37 2014 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../AbstractCompoundCellNameType.java | 21 +++++++++++------- .../org/apache/cassandra/cql3/CQLTester.java | 22 +++++++++++++++++++ .../apache/cassandra/cql3/UserTypesTest.java | 23 ++++++++++++++++++++ 4 files changed, 59 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f7fab28e/CHANGES.txt ----------------------------------------------------------------------
