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/bf5dd032 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bf5dd032 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bf5dd032 Branch: refs/heads/trunk Commit: bf5dd032fc7428cf3532a2d684ba07bd563435d4 Parents: 4bb5976 aba97fc Author: Aleksey Yeschenko <alek...@apache.org> Authored: Sat Sep 19 19:17:53 2015 +0100 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Sat Sep 19 19:17:53 2015 +0100 ---------------------------------------------------------------------- CHANGES.txt | 2 ++ src/java/org/apache/cassandra/db/ReadCommand.java | 6 ++++++ 2 files changed, 8 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/bf5dd032/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index bd51c80,851a19b..119870d --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,8 -1,6 +1,10 @@@ +3.2 + * Add transparent data encryption core classes (CASSANDRA-9945) + + 3.0.0-rc1 + * Fix mixed version read request compatibility for compact static tables + (CASSANDRA-10373) * Fix paging of DISTINCT with static and IN (CASSANDRA-10354) * Allow MATERIALIZED VIEW's SELECT statement to restrict primary key columns (CASSANDRA-9664)
