Updated Branches: refs/heads/trunk dd5a4bf0e -> a5c5f0a77
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/a5c5f0a7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a5c5f0a7 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a5c5f0a7 Branch: refs/heads/trunk Commit: a5c5f0a77244026e95f54e1722fe0c605cbbf9dd Parents: dd5a4bf 90ce4f7 Author: Aleksey Yeschenko <alek...@apache.org> Authored: Mon Dec 10 22:39:44 2012 +0300 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Mon Dec 10 22:39:44 2012 +0300 ---------------------------------------------------------------------- src/java/org/apache/cassandra/auth/Auth.java | 35 ++++++-------- .../apache/cassandra/service/StorageService.java | 8 +++- 2 files changed, 22 insertions(+), 21 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a5c5f0a7/src/java/org/apache/cassandra/service/StorageService.java ----------------------------------------------------------------------
