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/123fc31a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/123fc31a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/123fc31a Branch: refs/heads/trunk Commit: 123fc31ac1fd59fd20afff825a4db50b87ae03d4 Parents: 8b1c584 8547ecc Author: Jason Brown <jasedbr...@gmail.com> Authored: Thu Aug 13 06:35:08 2015 -0700 Committer: Jason Brown <jasedbr...@gmail.com> Committed: Thu Aug 13 06:35:08 2015 -0700 ---------------------------------------------------------------------- CHANGES.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/123fc31a/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 2b1b9cb,fae0cfc..f451af1 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,9 -1,4 +1,8 @@@ +3.2 + * Add transparent data encryption core classes (CASSANDRA-9945) + + 3.0.0-beta1 - * Route gossip messages over dedicated socket (CASSANDRA-9237) * Add option to only purge repaired tombstones (CASSANDRA-6434) * Change authorization handling for MVs (CASSANDRA-9927) * Add custom JMX enabled executor for UDF sandbox (CASSANDRA-10026)
