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/1e669e56 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1e669e56 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1e669e56 Branch: refs/heads/trunk Commit: 1e669e5629950df7156cfd482a2c702d804e5ee9 Parents: e44e21c 91e2501 Author: Aleksey Yeschenko <alek...@apache.org> Authored: Sat Sep 19 16:12:02 2015 +0100 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Sat Sep 19 16:12:02 2015 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/db/filter/DataLimits.java | 3 +++ .../apache/cassandra/service/pager/MultiPartitionPager.java | 6 +++--- 3 files changed, 7 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1e669e56/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 7e7a6c3,45fa773..bd51c80 --- 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 paging of DISTINCT with static and IN (CASSANDRA-10354) * Allow MATERIALIZED VIEW's SELECT statement to restrict primary key columns (CASSANDRA-9664) * Move crc_check_chance out of compression options (CASSANDRA-9839)
