cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alek...@apache.org
Subject [1/3] git commit: Merge branch 'cassandra-1.2.0' into cassandra-1.2
Date Tue, 27 Nov 2012 17:32:46 GMT
Updated Branches:
  refs/heads/cassandra-1.2 9a58e7e2e -> fbd640063


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/fbd64006
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fbd64006
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fbd64006

Branch: refs/heads/cassandra-1.2
Commit: fbd6400636bec6af857d3575d298f1ef26cd1159
Parents: 9a58e7e 5a3eb1a
Author: Aleksey Yeschenko <aleksey@apache.org>
Authored: Tue Nov 27 20:32:23 2012 +0300
Committer: Aleksey Yeschenko <aleksey@apache.org>
Committed: Tue Nov 27 20:32:23 2012 +0300

----------------------------------------------------------------------
 CHANGES.txt                                        |    1 +
 NEWS.txt                                           |   14 +
 conf/cassandra.yaml                                |    4 +-
 examples/client_only/conf/cassandra.yaml           |    4 +-
 examples/simple_authentication/README.txt          |    4 +-
 .../simple_authentication/conf/access.properties   |    2 +-
 .../org/apache/cassandra/auth/SimpleAuthority.java |  157 ---------
 .../apache/cassandra/auth/SimpleAuthorizer.java    |  157 +++++++++
 pylib/cqlshlib/cql3handling.py                     |   61 ++--
 .../cassandra/auth/AllowAllAuthenticator.java      |   10 +-
 .../apache/cassandra/auth/AllowAllAuthority.java   |   36 --
 .../apache/cassandra/auth/AllowAllAuthorizer.java  |   70 ++++
 .../apache/cassandra/auth/AuthenticatedUser.java   |   22 +-
 .../org/apache/cassandra/auth/DataResource.java    |  248 +++++++++++++++
 src/java/org/apache/cassandra/auth/IAuthority.java |   63 ----
 .../org/apache/cassandra/auth/IAuthority2.java     |   70 ----
 .../apache/cassandra/auth/IAuthorityContainer.java |   83 -----
 .../org/apache/cassandra/auth/IAuthorizer.java     |  122 +++++++
 src/java/org/apache/cassandra/auth/IResource.java  |   53 +++
 .../apache/cassandra/auth/LegacyAuthorizer.java    |  111 +++++++
 .../apache/cassandra/auth/MigrationListener.java   |   53 +++
 src/java/org/apache/cassandra/auth/Permission.java |   57 ++--
 .../apache/cassandra/auth/PermissionDenied.java    |   34 --
 .../apache/cassandra/auth/PermissionDetails.java   |   70 ++++
 src/java/org/apache/cassandra/auth/Resources.java  |   28 ++-
 src/java/org/apache/cassandra/config/Config.java   |    3 +-
 .../cassandra/config/DatabaseDescriptor.java       |   37 +--
 .../org/apache/cassandra/cql/DeleteStatement.java  |    2 +-
 .../apache/cassandra/cql/DropIndexStatement.java   |   65 +++--
 .../org/apache/cassandra/cql/QueryProcessor.java   |   77 ++---
 .../org/apache/cassandra/cql/UpdateStatement.java  |   10 +-
 src/java/org/apache/cassandra/cql3/Cql.g           |  116 ++++---
 .../org/apache/cassandra/cql3/QueryProcessor.java  |    2 +-
 .../cql3/statements/AuthorizationStatement.java    |   66 ++++
 .../cassandra/cql3/statements/BatchStatement.java  |    2 +-
 .../statements/CreateColumnFamilyStatement.java    |    2 +-
 .../cql3/statements/CreateKeyspaceStatement.java   |    2 +-
 .../cql3/statements/DropIndexStatement.java        |   57 ++--
 .../cassandra/cql3/statements/GrantStatement.java  |   17 +-
 .../cql3/statements/ListGrantsStatement.java       |   42 ---
 .../cql3/statements/ListPermissionsStatement.java  |  106 ++++++
 .../cql3/statements/ModificationStatement.java     |    5 +-
 .../statements/PermissionAlteringStatement.java    |   54 ++--
 .../cassandra/cql3/statements/RevokeStatement.java |   15 +-
 .../cql3/statements/TruncateStatement.java         |    2 +-
 .../apache/cassandra/service/CassandraDaemon.java  |    6 +
 .../org/apache/cassandra/service/ClientState.java  |  175 ++++-------
 .../apache/cassandra/thrift/CassandraServer.java   |  119 +++----
 test/conf/access.properties                        |    2 +-
 49 files changed, 1520 insertions(+), 998 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/fbd64006/CHANGES.txt
----------------------------------------------------------------------


Mime
View raw message