Repository: cassandra
Updated Branches:
refs/heads/trunk ae93155c7 -> 16a3a3787
Give read access to system.schema_usertypes to all authenticated users
patch by Mike Adamson; reviewed by Aleksey Yeschenko for CASSANDRA-7578
Conflicts:
CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/465d520c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/465d520c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/465d520c
Branch: refs/heads/trunk
Commit: 465d520cc2053abbc08c5b272c820de35c9392fa
Parents: c7b7a24
Author: Mike Adamson <madam...@datastax.com>
Authored: Mon Jul 21 14:36:01 2014 +0100
Committer: Aleksey Yeschenko <alek...@apache.org>
Committed: Thu Jul 24 20:30:07 2014 +0300
----------------------------------------------------------------------
CHANGES.txt | 3 +++
src/java/org/apache/cassandra/service/ClientState.java | 3 ++-
2 files changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/465d520c/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index caef095..78b0186 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,7 +1,10 @@
2.1.0-final
+ * Give read access to system.schema_usertypes to all authenticated users
+ (CASSANDRA-7578)
* Fix cqlsh display when zero rows are returned (CASSANDRA-7580)
* Get java version correctly when JAVA_TOOL_OPTIONS is set (CASSANDRA-7572)
+
2.1.0-rc4
* Fix word count hadoop example (CASSANDRA-7200)
* Updated memtable_cleanup_threshold and memtable_flush_writers defaults
http://git-wip-us.apache.org/repos/asf/cassandra/blob/465d520c/src/java/org/apache/cassandra/service/ClientState.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/ClientState.java
b/src/java/org/apache/cassandra/service/ClientState.java
index be3b895..c0396cb 100644
--- a/src/java/org/apache/cassandra/service/ClientState.java
+++ b/src/java/org/apache/cassandra/service/ClientState.java
@@ -67,7 +67,8 @@ public class ClientState
SystemKeyspace.PEERS_CF,
SystemKeyspace.SCHEMA_KEYSPACES_CF,
SystemKeyspace.SCHEMA_COLUMNFAMILIES_CF,
- SystemKeyspace.SCHEMA_COLUMNS_CF };
+ SystemKeyspace.SCHEMA_COLUMNS_CF,
+ SystemKeyspace.SCHEMA_USER_TYPES_CF};
for (String cf : cfs)
READABLE_SYSTEM_RESOURCES.add(DataResource.columnFamily(Keyspace.SYSTEM_KS,
cf));
