Updated Branches: refs/heads/trunk ab1078178 -> eb1e1b0d4
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/eb1e1b0d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/eb1e1b0d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/eb1e1b0d Branch: refs/heads/trunk Commit: eb1e1b0d47229d835354fdac384818694658cc30 Parents: ab10781 f563076 Author: Aleksey Yeschenko <[email protected]> Authored: Sat Dec 8 20:48:39 2012 +0300 Committer: Aleksey Yeschenko <[email protected]> Committed: Sat Dec 8 20:48:39 2012 +0300 ---------------------------------------------------------------------- src/java/org/apache/cassandra/auth/Auth.java | 22 +++++++++++++++----- 1 files changed, 16 insertions(+), 6 deletions(-) ----------------------------------------------------------------------
