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/220f253f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/220f253f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/220f253f Branch: refs/heads/trunk Commit: 220f253fb30809f55368a30e2594735bc8362718 Parents: 79f4bdb fd5cb43 Author: Sylvain Lebresne <[email protected]> Authored: Fri Dec 4 10:10:42 2015 +0100 Committer: Sylvain Lebresne <[email protected]> Committed: Fri Dec 4 10:10:42 2015 +0100 ---------------------------------------------------------------------- CHANGES.txt | 2 + .../apache/cassandra/db/RangeTombstoneList.java | 47 +- .../apache/cassandra/utils/SearchIterator.java | 3 +- test/unit/org/apache/cassandra/Util.java | 23 + .../partition/PartitionImplementationTest.java | 524 +++++++++++++++++++ 5 files changed, 566 insertions(+), 33 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/220f253f/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 08266d3,7a6076b..711bdde --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,19 -1,7 +1,21 @@@ +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: + * Fix bug with range tombstones on reverse queries and test coverage for + AbstractBTreePartition (CASSANDRA-10059) * Remove 64k limit on collection elements (CASSANDRA-10374) * Remove unclear Indexer.indexes() method (CASSANDRA-10690) * Fix NPE on stream read error (CASSANDRA-10771) http://git-wip-us.apache.org/repos/asf/cassandra/blob/220f253f/src/java/org/apache/cassandra/db/RangeTombstoneList.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/220f253f/test/unit/org/apache/cassandra/Util.java ----------------------------------------------------------------------
