cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alek...@apache.org
Subject [3/3] cassandra git commit: Merge branch 'cassandra-2.1' into trunk
Date Fri, 09 Jan 2015 01:09:35 GMT
Merge branch 'cassandra-2.1' into trunk


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2fc3a893
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2fc3a893
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2fc3a893

Branch: refs/heads/trunk
Commit: 2fc3a8934b211af762f9b3bec4c5b2dc46d6e0f5
Parents: e412319 8c5a959
Author: Aleksey Yeschenko <aleksey@apache.org>
Authored: Fri Jan 9 04:08:30 2015 +0300
Committer: Aleksey Yeschenko <aleksey@apache.org>
Committed: Fri Jan 9 04:08:30 2015 +0300

----------------------------------------------------------------------
 CHANGES.txt                                     |   2 +
 conf/cassandra.yaml                             |   8 ++
 src/java/org/apache/cassandra/auth/Auth.java    |  55 ++--------
 .../org/apache/cassandra/auth/AuthMBean.java    |  27 -----
 .../apache/cassandra/auth/PermissionsCache.java | 108 +++++++++++++++++++
 .../org/apache/cassandra/config/Config.java     |   2 +
 .../cassandra/config/DatabaseDescriptor.java    |  10 +-
 .../apache/cassandra/service/ClientState.java   |  15 +--
 8 files changed, 138 insertions(+), 89 deletions(-)
----------------------------------------------------------------------


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

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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/2fc3a893/src/java/org/apache/cassandra/config/Config.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/2fc3a893/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/2fc3a893/src/java/org/apache/cassandra/service/ClientState.java
----------------------------------------------------------------------


Mime
View raw message