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/ad120334 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ad120334 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ad120334 Branch: refs/heads/trunk Commit: ad1203349549412f8306ffdeb57caf99769aabae Parents: 13ebb57 a26d25f Author: Sam Tunnicliffe <s...@beobal.com> Authored: Fri Nov 11 17:44:37 2016 +0000 Committer: Sam Tunnicliffe <s...@beobal.com> Committed: Fri Nov 11 17:44:37 2016 +0000 ---------------------------------------------------------------------- src/java/org/apache/cassandra/auth/CassandraRoleManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ----------------------------------------------------------------------