Updated Branches: refs/heads/trunk e55740885 -> ab1078178
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/ab107817 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ab107817 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ab107817 Branch: refs/heads/trunk Commit: ab107817868d95ab926928b43d8acdd0a768f84f Parents: e557408 0cd66d7 Author: Aleksey Yeschenko <alek...@apache.org> Authored: Sat Dec 8 19:41:08 2012 +0300 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Sat Dec 8 19:41:08 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(-) ----------------------------------------------------------------------
