Merge branch 'cassandra-1.2' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/58910796 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/58910796 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/58910796 Branch: refs/heads/trunk Commit: 5891079667382d75fc8ef73cf6e38f09ee9fb717 Parents: 0b36afa 1b5edee Author: Aleksey Yeschenko <[email protected]> Authored: Sun May 26 05:42:03 2013 +0300 Committer: Aleksey Yeschenko <[email protected]> Committed: Sun May 26 05:42:03 2013 +0300 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/auth/Auth.java | 62 +++++++++----- .../apache/cassandra/auth/CassandraAuthorizer.java | 37 +++++++-- .../cassandra/auth/PasswordAuthenticator.java | 40 +++++++--- 4 files changed, 100 insertions(+), 40 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/58910796/CHANGES.txt ----------------------------------------------------------------------
