cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alek...@apache.org
Subject [2/4] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2
Date Tue, 25 Aug 2015 09:48:17 GMT
Merge branch 'cassandra-2.1' into cassandra-2.2


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

Branch: refs/heads/trunk
Commit: d1d10fae008545b415bd72e68f63c983d44a8db7
Parents: 1992598 978660d
Author: Aleksey Yeschenko <aleksey@apache.org>
Authored: Tue Aug 25 12:45:51 2015 +0300
Committer: Aleksey Yeschenko <aleksey@apache.org>
Committed: Tue Aug 25 12:45:51 2015 +0300

----------------------------------------------------------------------
 CHANGES.txt                                                 | 3 +--
 src/java/org/apache/cassandra/auth/CassandraAuthorizer.java | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/d1d10fae/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 664a23e,d6a0af9..34615db
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,20 -1,6 +1,19 @@@
 -2.1.9
 +2.2.1
 + * add CLEAR cqlsh command (CASSANDRA-10086)
 + * Support string literals as Role names for compatibility (CASSANDRA-10135)
 + * Allow count(*) and count(1) to be use as normal aggregation (CASSANDRA-10114)
 + * An NPE is thrown if the column name is unknown for an IN relation (CASSANDRA-10043)
 + * Apply commit_failure_policy to more errors on startup (CASSANDRA-9749)
 + * Fix histogram overflow exception (CASSANDRA-9973)
 + * Route gossip messages over dedicated socket (CASSANDRA-9237)
 + * Add checksum to saved cache files (CASSANDRA-9265)
 + * Log warning when using an aggregate without partition key (CASSANDRA-9737)
 + * Avoid grouping sstables for anticompaction with DTCS (CASSANDRA-9900)
 + * UDF / UDA execution time in trace (CASSANDRA-9723)
 + * Fix broken internode SSL (CASSANDRA-9884)
 +Merged from 2.1:
   * (cqlsh) default load-from-file encoding to utf-8 (CASSANDRA-9898)
-  * Avoid returning Permission.None when system_auth.permissions table does not
-    exist (CASSANDRA-10168)
+  * Avoid returning Permission.NONE when failing to query users table (CASSANDRA-10168)
   * (cqlsh) Allow encoding to be set through command line (CASSANDRA-10004)
   * Add new JMX methods to change local compaction strategy (CASSANDRA-9965)
   * Write hints for paxos commits (CASSANDRA-7342)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/d1d10fae/src/java/org/apache/cassandra/auth/CassandraAuthorizer.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/auth/CassandraAuthorizer.java
index 7911acc,49eefb1..5cdea3f
--- a/src/java/org/apache/cassandra/auth/CassandraAuthorizer.java
+++ b/src/java/org/apache/cassandra/auth/CassandraAuthorizer.java
@@@ -89,9 -83,15 +89,9 @@@ public class CassandraAuthorizer implem
          catch (RequestExecutionException e)
          {
              logger.warn("CassandraAuthorizer failed to authorize {} for {}", user, resource);
-             return Permission.NONE;
+             throw new RuntimeException(e);
          }
  
 -        if (result.isEmpty() || !result.one().has(PERMISSIONS))
 -            return Permission.NONE;
 -
 -        Set<Permission> permissions = EnumSet.noneOf(Permission.class);
 -        for (String perm : result.one().getSet(PERMISSIONS, UTF8Type.instance))
 -            permissions.add(Permission.valueOf(perm));
          return permissions;
      }
  


Mime
View raw message