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/3462a23d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3462a23d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3462a23d Branch: refs/heads/trunk Commit: 3462a23dc2e2492f6a94ba131a16e4bce31b4b25 Parents: d9e9c94 72acd6b Author: Aleksey Yeschenko <[email protected]> Authored: Tue Aug 11 21:40:52 2015 +0300 Committer: Aleksey Yeschenko <[email protected]> Committed: Tue Aug 11 21:42:34 2015 +0300 ---------------------------------------------------------------------- CHANGES.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/3462a23d/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index b817cfd,d7e84bf..0ebc6d5 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,3 -1,3 +1,7 @@@ ++3.2 ++ * Add transparent data encryption core classes (CASSANDRA-9945) ++ ++ 3.0.0-beta1 * Add option to only purge repaired tombstones (CASSANDRA-6434) * Change authorization handling for MVs (CASSANDRA-9927)
