cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alek...@apache.org
Subject [2/2] git commit: Merge branch 'cassandra-1.2' into trunk
Date Thu, 14 Feb 2013 22:28:33 GMT
Updated Branches:
  refs/heads/trunk 12e4c524b -> 36f632c9e


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

Branch: refs/heads/trunk
Commit: 36f632c9eb866b995673b3d03ae9d469eb261098
Parents: 12e4c52 0b83682
Author: Aleksey Yeschenko <aleksey@apache.org>
Authored: Fri Feb 15 01:27:36 2013 +0300
Committer: Aleksey Yeschenko <aleksey@apache.org>
Committed: Fri Feb 15 01:27:36 2013 +0300

----------------------------------------------------------------------
 CHANGES.txt                                        |    2 +
 NEWS.txt                                           |   17 +
 build.xml                                          |    3 +-
 conf/cassandra.yaml                                |   22 +-
 examples/simple_authentication/README.txt          |   25 --
 .../simple_authentication/conf/access.properties   |   39 ---
 .../simple_authentication/conf/passwd.properties   |   24 --
 .../apache/cassandra/auth/SimpleAuthenticator.java |  142 --------
 .../apache/cassandra/auth/SimpleAuthorizer.java    |  157 ---------
 lib/jbcrypt-0.3m.jar                               |  Bin 0 -> 17750 bytes
 lib/licenses/jbcrypt-0.3m.txt                      |   17 +
 src/java/org/apache/cassandra/auth/Auth.java       |    8 +-
 .../apache/cassandra/auth/CassandraAuthorizer.java |  254 +++++++++++++++
 .../org/apache/cassandra/auth/IAuthenticator.java  |   20 +-
 .../org/apache/cassandra/auth/IAuthorizer.java     |   24 +-
 .../apache/cassandra/auth/LegacyAuthenticator.java |   14 +-
 .../apache/cassandra/auth/LegacyAuthorizer.java    |    4 +-
 .../cassandra/auth/PasswordAuthenticator.java      |  223 +++++++++++++
 .../org/apache/cassandra/cli/CliSessionState.java  |    4 +-
 .../cql3/statements/AlterUserStatement.java        |   15 +-
 .../cql3/statements/CreateUserStatement.java       |   12 +-
 .../cql3/statements/DropUserStatement.java         |    9 +-
 .../cassandra/cql3/statements/GrantStatement.java  |    6 +-
 .../cql3/statements/ListPermissionsStatement.java  |   16 +-
 .../statements/PermissionAlteringStatement.java    |   22 +-
 .../cassandra/cql3/statements/RevokeStatement.java |    6 +-
 .../org/apache/cassandra/service/ClientState.java  |    5 +-
 test/conf/access.properties                        |   29 --
 28 files changed, 630 insertions(+), 489 deletions(-)
----------------------------------------------------------------------


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/36f632c9/build.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/36f632c9/conf/cassandra.yaml
----------------------------------------------------------------------


Mime
View raw message