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/233cc8b2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/233cc8b2 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/233cc8b2 Branch: refs/heads/trunk Commit: 233cc8b29710066c2772b6ffcd9c71a66360fc77 Parents: 335aa9f e62238e Author: Sylvain Lebresne <[email protected]> Authored: Thu Mar 20 10:13:13 2014 +0100 Committer: Sylvain Lebresne <[email protected]> Committed: Thu Mar 20 10:13:13 2014 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../cassandra/db/marshal/CollectionType.java | 5 - .../apache/cassandra/db/marshal/ListType.java | 33 ++++++ .../apache/cassandra/db/marshal/MapType.java | 34 ++++++ .../apache/cassandra/db/marshal/SetType.java | 6 + .../db/marshal/CollectionTypeTest.java | 116 +++++++++++++++++++ 6 files changed, 190 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/233cc8b2/CHANGES.txt ----------------------------------------------------------------------
