Updated Branches: refs/heads/cassandra-1.2 9b61606a5 -> 90ce4f78d
Merge branch 'cassandra-1.2.0' into cassandra-1.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/90ce4f78 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/90ce4f78 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/90ce4f78 Branch: refs/heads/cassandra-1.2 Commit: 90ce4f78d8e5fbbc88cd4d05d51826e9abb7c922 Parents: 9b61606 26e71c1 Author: Aleksey Yeschenko <alek...@apache.org> Authored: Mon Dec 10 22:39:07 2012 +0300 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Mon Dec 10 22:39:07 2012 +0300 ---------------------------------------------------------------------- src/java/org/apache/cassandra/auth/Auth.java | 35 ++++++-------- .../apache/cassandra/service/StorageService.java | 8 +++- 2 files changed, 22 insertions(+), 21 deletions(-) ----------------------------------------------------------------------
