Merge branch 'cassandra-1.2.0' of https://git-wip-us.apache.org/repos/asf/cassandra into cassandra-1.2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/183b5520 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/183b5520 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/183b5520 Branch: refs/heads/cassandra-1.2.0 Commit: 183b55204bb3b558dea500f009118ab7824afd6e Parents: cbd73a4 26e71c1 Author: Sylvain Lebresne <[email protected]> Authored: Tue Dec 11 08:49:17 2012 +0100 Committer: Sylvain Lebresne <[email protected]> Committed: Tue Dec 11 08:49:17 2012 +0100 ---------------------------------------------------------------------- src/java/org/apache/cassandra/auth/Auth.java | 35 ++++++-------- .../apache/cassandra/service/StorageService.java | 8 +++- 2 files changed, 22 insertions(+), 21 deletions(-) ----------------------------------------------------------------------
