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/724ba07a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/724ba07a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/724ba07a Branch: refs/heads/trunk Commit: 724ba07a7f0aab1b372cc722d78cbe1b683db32d Parents: f505e8b 8a8427d Author: Sam Tunnicliffe <s...@beobal.com> Authored: Tue Nov 3 17:31:02 2015 +0000 Committer: Sam Tunnicliffe <s...@beobal.com> Committed: Tue Nov 3 17:31:02 2015 +0000 ---------------------------------------------------------------------- CHANGES.txt | 1 + NEWS.txt | 3 +++ src/java/org/apache/cassandra/auth/AllowAllAuthenticator.java | 3 ++- src/java/org/apache/cassandra/auth/IAuthenticator.java | 5 ++++- src/java/org/apache/cassandra/auth/PasswordAuthenticator.java | 3 ++- src/java/org/apache/cassandra/transport/ServerConnection.java | 4 ++-- .../org/apache/cassandra/transport/messages/AuthResponse.java | 2 +- 7 files changed, 15 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/724ba07a/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 7788aa8,9266386..b0aad8c --- 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 + * Add client address argument to IAuthenticator::newSaslNegotiator (CASSANDRA-8068) * Fix implementation of LegacyLayout.LegacyBoundComparator (CASSANDRA-10602) * Don't use 'names query' read path for counters (CASSANDRA-10572) * Fix backward compatibility for counters (CASSANDRA-10470)
