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/4f62eb95 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4f62eb95 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4f62eb95 Branch: refs/heads/trunk Commit: 4f62eb953cf4eedee82e387b614955fca50b1770 Parents: 3a2dd0c 9b727ac Author: Robert Stupp <sn...@snazy.de> Authored: Mon Oct 26 10:03:28 2015 +0100 Committer: Robert Stupp <sn...@snazy.de> Committed: Mon Oct 26 10:03:28 2015 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/auth/RolesCache.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4f62eb95/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index dae9264,f737a2b..2c4a145 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,10 -1,5 +1,11 @@@ +3.2 + * Added graphing option to cassandra-stress (CASSANDRA-7918) + * Abort in-progress queries that time out (CASSANDRA-7392) + * Add transparent data encryption core classes (CASSANDRA-9945) + + 3.0 + * RolesCache should not be created for any authenticator that does not requireAuthentication (CASSANDRA-10562) * Fix LogTransaction checking only a single directory for files (CASSANDRA-10421) * Support encrypted and plain traffic on the same port (CASSANDRA-10559) * Fix handling of range tombstones when reading old format sstables (CASSANDRA-10360)
