Updated Branches: refs/heads/trunk 59a905c83 -> ebae28ec2
1.2 specific changes related to CASSANDRA-4664 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ebae28ec Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ebae28ec Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ebae28ec Branch: refs/heads/trunk Commit: ebae28ec27e14083026cc9006381a0fe3e7c703f Parents: 59a905c Author: Pavel Yaskevich <xe...@apache.org> Authored: Fri Sep 21 13:22:01 2012 +0300 Committer: Pavel Yaskevich <xe...@apache.org> Committed: Fri Sep 21 13:22:01 2012 +0300 ---------------------------------------------------------------------- .../org/apache/cassandra/cql/QueryProcessor.java | 2 +- .../apache/cassandra/thrift/CassandraServer.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ebae28ec/src/java/org/apache/cassandra/cql/QueryProcessor.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/cql/QueryProcessor.java b/src/java/org/apache/cassandra/cql/QueryProcessor.java index f3800cb..1670c3b 100644 --- a/src/java/org/apache/cassandra/cql/QueryProcessor.java +++ b/src/java/org/apache/cassandra/cql/QueryProcessor.java @@ -729,7 +729,7 @@ public class QueryProcessor try { CFMetaData updatedCF = dropIdx.generateCFMetadataUpdate(clientState.getKeyspace()); - clientState.hasColumnFamilyAccess(updatedCF.ksName, updatedCF.cfName, Permission.USE); + clientState.hasColumnFamilyAccess(updatedCF.ksName, updatedCF.cfName, Permission.DESCRIBE); MigrationManager.announceColumnFamilyUpdate(updatedCF); } http://git-wip-us.apache.org/repos/asf/cassandra/blob/ebae28ec/src/java/org/apache/cassandra/thrift/CassandraServer.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/thrift/CassandraServer.java b/src/java/org/apache/cassandra/thrift/CassandraServer.java index 9b59519..73ecd29 100644 --- a/src/java/org/apache/cassandra/thrift/CassandraServer.java +++ b/src/java/org/apache/cassandra/thrift/CassandraServer.java @@ -1185,7 +1185,7 @@ public class CassandraServer implements Cassandra.Iface { try { - state().hasKeyspaceAccess(ks, Permission.USE); + state().hasKeyspaceAccess(ks, Permission.DESCRIBE); ksset.add(describe_keyspace(ks)); } catch (UnauthorizedException e)
