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/13ebb57e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/13ebb57e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/13ebb57e Branch: refs/heads/trunk Commit: 13ebb57eb07c0a0f6cab4af3278e0e2ee730f3d2 Parents: dba9080 e3f37c4 Author: Sam Tunnicliffe <s...@beobal.com> Authored: Fri Nov 11 11:32:57 2016 +0000 Committer: Sam Tunnicliffe <s...@beobal.com> Committed: Fri Nov 11 11:32:57 2016 +0000 ---------------------------------------------------------------------- .../cassandra/auth/CassandraRoleManager.java | 23 +++++++++++++++----- 1 file changed, 17 insertions(+), 6 deletions(-) ----------------------------------------------------------------------
