Merge branch 'cassandra-2.1.0' into cassandra-2.1
Conflicts:
CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/40a1cd36
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/40a1cd36
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/40a1cd36
Branch: refs/heads/cassandra-2.1
Commit: 40a1cd369164b0202c315309fc9fc69c448af6f5
Parents: 97e74ee cd84cc9
Author: Sylvain Lebresne <sylv...@datastax.com>
Authored: Wed Aug 6 11:10:36 2014 +0200
Committer: Sylvain Lebresne <sylv...@datastax.com>
Committed: Wed Aug 6 11:10:36 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/40a1cd36/CHANGES.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/40a1cd36/src/java/org/apache/cassandra/db/composites/AbstractCompoundCellNameType.java
----------------------------------------------------------------------
