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/c18ab385 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c18ab385 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c18ab385 Branch: refs/heads/trunk Commit: c18ab38578e6d1b7e49f3eb9e1894e80bc3c8f55 Parents: 33152d8 8324818 Author: Sam Tunnicliffe <[email protected]> Authored: Thu Sep 10 12:50:45 2015 +0100 Committer: Sam Tunnicliffe <[email protected]> Committed: Thu Sep 10 12:50:45 2015 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../cassandra/auth/CassandraRoleManager.java | 91 +++++++++++++------- .../apache/cassandra/net/MessagingService.java | 33 ++++++- 3 files changed, 95 insertions(+), 30 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c18ab385/CHANGES.txt ----------------------------------------------------------------------
