Merge branch 'cassandra-3.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/be8b9f29 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/be8b9f29 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/be8b9f29 Branch: refs/heads/trunk Commit: be8b9f299ebdd3c342398fb09db625c59d0f6cb0 Parents: 375465d aef7169 Author: Aleksey Yeschenko <[email protected]> Authored: Fri Sep 18 22:12:37 2015 +0100 Committer: Aleksey Yeschenko <[email protected]> Committed: Fri Sep 18 22:12:37 2015 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../cassandra/utils/btree/BTreeSearchIterator.java | 5 ++--- .../apache/cassandra/utils/btree/TreeCursor.java | 16 +++++++--------- .../org/apache/cassandra/utils/LongBTreeTest.java | 9 ++++++--- 4 files changed, 16 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/be8b9f29/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index e805446,2c0cde2..537eeeb --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,8 -1,5 +1,9 @@@ +3.2 + * Add transparent data encryption core classes (CASSANDRA-9945) + + 3.0.0-rc1 + * Fix descending iteration past end of BTreeSearchIterator (CASSANDRA-10301) * Transfer hints to a different node on decommission (CASSANDRA-10198) * Check partition keys for CAS operations during stmt validation (CASSANDRA-10338) * Add custom query expressions to SELECT (CASSANDRA-10217)
