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/fd5cb43d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fd5cb43d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fd5cb43d Branch: refs/heads/trunk Commit: fd5cb43da87f0dd5e4c8e3e80ec293bcaa23d0fb Parents: 29c653d 1e978df Author: Sylvain Lebresne <[email protected]> Authored: Fri Dec 4 10:10:20 2015 +0100 Committer: Sylvain Lebresne <[email protected]> Committed: Fri Dec 4 10:10:20 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/fd5cb43d/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index bb8653c,2527c43..7a6076b --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,5 -1,6 +1,7 @@@ -3.0.1 +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)
