Merge branch 'cassandra-3.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/c19aa154 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c19aa154 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c19aa154 Branch: refs/heads/trunk Commit: c19aa154ae9cbcbad6acb4734d2fc9287d2811dd Parents: 4ca7a8c 2a33c3b Author: Benjamin Lerer <b.le...@gmail.com> Authored: Thu Dec 3 22:57:09 2015 +0100 Committer: Benjamin Lerer <b.le...@gmail.com> Committed: Thu Dec 3 22:57:22 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/c19aa154/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index dc811ba,bb8653c..08266d3 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,19 -1,6 +1,20 @@@ +3.2 + * Normalize all scripts (CASSANDRA-10679) + * Make compression ratio much more accurate (CASSANDRA-10225) + * Optimize building of Clustering object when only one is created (CASSANDRA-10409) + * Make index building pluggable (CASSANDRA-10681) + * Add sstable flush observer (CASSANDRA-10678) + * Improve NTS endpoints calculation (CASSANDRA-10200) + * Improve performance of the folderSize function (CASSANDRA-10677) + * Add support for type casting in selection clause (CASSANDRA-10310) + * Added graphing option to cassandra-stress (CASSANDRA-7918) + * Abort in-progress queries that time out (CASSANDRA-7392) + * Add transparent data encryption core classes (CASSANDRA-9945) + + 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)