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/7aa49acf Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7aa49acf Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7aa49acf Branch: refs/heads/trunk Commit: 7aa49acf6b117fed96ffb86d4cbdb86b7eb014f8 Parents: dc2f6d6 6e48573 Author: Sam Tunnicliffe <[email protected]> Authored: Sat Aug 22 22:33:20 2015 +0100 Committer: Sam Tunnicliffe <[email protected]> Committed: Sat Aug 22 22:33:20 2015 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + 1 file changed, 1 insertion(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/7aa49acf/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index d03b430,8d92393..4a446aa --- 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-beta1 + * Redesign secondary index API (CASSANDRA-9459, 7771, 9041) * Fix throwing ReadFailure instead of ReadTimeout on range queries (CASSANDRA-10125) * Rewrite hinted handoff (CASSANDRA-6230) * Fix query on static compact tables (CASSANDRA-10093)
