Merge branch 'cassandra-3.0' into cassandra-3.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2a33c3b1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2a33c3b1 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2a33c3b1 Branch: refs/heads/trunk Commit: 2a33c3b192f405cc96fc2aa833f9534028ff707a Parents: fca24e1 bc9a61f Author: Benjamin Lerer <b.le...@gmail.com> Authored: Thu Dec 3 22:56:07 2015 +0100 Committer: Benjamin Lerer <b.le...@gmail.com> Committed: Thu Dec 3 22:56:07 2015 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/cql3/Lists.java | 13 -- src/java/org/apache/cassandra/cql3/Maps.java | 17 +- src/java/org/apache/cassandra/cql3/Sets.java | 7 - .../validation/entities/CollectionsTest.java | 166 +++++++++++++++++++ .../entities/FrozenCollectionsTest.java | 98 +++++++++++ 6 files changed, 266 insertions(+), 36 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2a33c3b1/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 295b444,f6aed18..bb8653c --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,5 -1,5 +1,6 @@@ -3.0.1 +3.1 +Merged from 3.0: + * Remove 64k limit on collection elements (CASSANDRA-10374) * Remove unclear Indexer.indexes() method (CASSANDRA-10690) * Fix NPE on stream read error (CASSANDRA-10771) * Normalize cqlsh DESC output (CASSANDRA-10431)
