Merge branch 'cassandra-3.0' of http://git-wip-us.apache.org/repos/asf/cassandra into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/25e0625f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/25e0625f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/25e0625f Branch: refs/heads/trunk Commit: 25e0625f679c8303552e48ba18465b3466adf8db Parents: 00b7efa 9b727ac Author: Sylvain Lebresne <[email protected]> Authored: Mon Oct 26 10:29:13 2015 +0100 Committer: Sylvain Lebresne <[email protected]> Committed: Mon Oct 26 10:29:13 2015 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/auth/RolesCache.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) ----------------------------------------------------------------------
