Merge branch 'cassandra-3.11' into trunk

Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c8241659
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c8241659
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c8241659

Branch: refs/heads/trunk
Commit: c8241659ec7272c530be92f79ac89046980a2f4a
Parents: ccef21f 5b77e04
Author: Robert Stupp <[email protected]>
Authored: Mon Apr 3 11:32:56 2017 +0100
Committer: Robert Stupp <[email protected]>
Committed: Mon Apr 3 11:32:56 2017 +0100

----------------------------------------------------------------------
 .../cql3/functions/ThreadAwareSecurityManager.java      | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


Reply via email to