Merge branch 'cassandra-3.X' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9e8b7c0d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9e8b7c0d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9e8b7c0d Branch: refs/heads/trunk Commit: 9e8b7c0d0d00e7f75f893906c6d52951bda0579e Parents: 0919ae2 9be467a Author: Sam Tunnicliffe <s...@beobal.com> Authored: Fri Oct 28 16:18:13 2016 +0100 Committer: Sam Tunnicliffe <s...@beobal.com> Committed: Fri Oct 28 16:18:13 2016 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../cassandra/auth/CassandraAuthorizer.java | 13 ++++-- .../cassandra/auth/PasswordAuthenticator.java | 42 ++++++++++++++------ 3 files changed, 41 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/9e8b7c0d/CHANGES.txt ----------------------------------------------------------------------