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/0cd66d7d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0cd66d7d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0cd66d7d Branch: refs/heads/trunk Commit: 0cd66d7dc7a26390a6154528af000ac0bc7cecae Parents: 24154fc 62b9037 Author: Aleksey Yeschenko <alek...@apache.org> Authored: Sat Dec 8 19:40:30 2012 +0300 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Sat Dec 8 19:40:30 2012 +0300 ---------------------------------------------------------------------- src/java/org/apache/cassandra/auth/Auth.java | 28 +++++++++++---- .../org/apache/cassandra/cql3/QueryProcessor.java | 6 +++- .../cql3/statements/AlterUserStatement.java | 3 +- .../cql3/statements/CreateUserStatement.java | 3 +- .../cql3/statements/DropUserStatement.java | 3 +- 5 files changed, 32 insertions(+), 11 deletions(-) ----------------------------------------------------------------------
