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/ee0d178c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ee0d178c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ee0d178c Branch: refs/heads/trunk Commit: ee0d178c6e9581bcb9f6d50924bdae53fc4155fa Parents: 2828d28 bddfa9e Author: Aleksey Yeschenko <alek...@apache.org> Authored: Sat Dec 8 18:28:10 2012 +0300 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Sat Dec 8 18:28:10 2012 +0300 ---------------------------------------------------------------------- CHANGES.txt | 1 + NEWS.txt | 14 ++ doc/native_protocol.spec | 2 + .../simple_authentication/conf/passwd.properties | 5 +- .../apache/cassandra/auth/SimpleAuthenticator.java | 24 +-- pylib/cqlshlib/cql3handling.py | 42 ++++- .../cassandra/auth/AllowAllAuthenticator.java | 50 +++++- .../apache/cassandra/auth/AllowAllAuthorizer.java | 18 +- src/java/org/apache/cassandra/auth/Auth.java | 131 +++++++++++++++ .../apache/cassandra/auth/AuthenticatedUser.java | 38 +++- .../org/apache/cassandra/auth/IAuthenticator.java | 96 ++++++++++- .../org/apache/cassandra/auth/IAuthorizer.java | 18 +- src/java/org/apache/cassandra/auth/IResource.java | 8 +- .../apache/cassandra/auth/LegacyAuthenticator.java | 92 ++++++++++ .../apache/cassandra/auth/LegacyAuthorizer.java | 15 +- .../org/apache/cassandra/config/CFMetaData.java | 6 + .../cassandra/config/DatabaseDescriptor.java | 4 +- .../org/apache/cassandra/config/KSMetaData.java | 7 + src/java/org/apache/cassandra/config/Schema.java | 5 +- src/java/org/apache/cassandra/cql3/Cql.g | 88 +++++++++-- .../org/apache/cassandra/cql3/QueryProcessor.java | 21 +++ .../org/apache/cassandra/cql3/UserOptions.java | 62 +++++++ .../cql3/statements/AlterUserStatement.java | 86 ++++++++++ .../cql3/statements/AuthenticationStatement.java | 57 +++++++ .../cql3/statements/AuthorizationStatement.java | 10 +- .../cql3/statements/CreateUserStatement.java | 64 +++++++ .../cql3/statements/DropUserStatement.java | 62 +++++++ .../cassandra/cql3/statements/GrantStatement.java | 7 +- .../cql3/statements/ListPermissionsStatement.java | 25 ++- .../cql3/statements/ListUsersStatement.java | 48 ++++++ .../statements/PermissionAlteringStatement.java | 7 +- .../cassandra/cql3/statements/RevokeStatement.java | 7 +- .../exceptions/AuthenticationException.java | 26 +++ .../apache/cassandra/exceptions/ExceptionCode.java | 2 + .../apache/cassandra/service/CassandraDaemon.java | 8 +- .../org/apache/cassandra/service/ClientState.java | 60 +++---- .../apache/cassandra/thrift/CassandraServer.java | 9 +- .../apache/cassandra/thrift/ThriftConversion.java | 5 + .../transport/messages/CredentialsMessage.java | 3 +- .../cassandra/transport/messages/ErrorMessage.java | 3 + .../transport/messages/StartupMessage.java | 6 +- 41 files changed, 1079 insertions(+), 163 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ee0d178c/CHANGES.txt ----------------------------------------------------------------------
