Updated Branches: refs/heads/trunk ff86f3f9a -> 23da64c81
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/23da64c8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/23da64c8 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/23da64c8 Branch: refs/heads/trunk Commit: 23da64c81959fc148d92d0609dc51c74d7a41e37 Parents: ff86f3f 2513480 Author: Aleksey Yeschenko <[email protected]> Authored: Tue Mar 12 01:28:16 2013 +0300 Committer: Aleksey Yeschenko <[email protected]> Committed: Tue Mar 12 01:28:16 2013 +0300 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/auth/Auth.java | 39 +++++++---- .../apache/cassandra/auth/CassandraAuthorizer.java | 2 +- .../cassandra/auth/PasswordAuthenticator.java | 52 ++++++++++----- 4 files changed, 63 insertions(+), 31 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/23da64c8/CHANGES.txt ----------------------------------------------------------------------
