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/8752bfa5 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8752bfa5 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8752bfa5 Branch: refs/heads/trunk Commit: 8752bfa5a00821bef28f79acdc12cd3893342f82 Parents: 5f399ca 35a653c Author: Aleksey Yeschenko <alek...@apache.org> Authored: Mon Dec 10 22:00:41 2012 +0300 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Mon Dec 10 22:00:41 2012 +0300 ---------------------------------------------------------------------- src/java/org/apache/cassandra/auth/Auth.java | 14 +++++++------- .../org/apache/cassandra/cql3/QueryProcessor.java | 12 ++---------- .../cql3/statements/AlterUserStatement.java | 4 ++-- .../cql3/statements/CreateUserStatement.java | 4 ++-- .../cql3/statements/DropUserStatement.java | 4 ++-- 5 files changed, 15 insertions(+), 23 deletions(-) ----------------------------------------------------------------------
