Updated Branches: refs/heads/trunk 1c017e0d8 -> c65f9e7ed
ninja-remove 'authority' from cassandra.yaml (deprecated in 1.2.0) Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c65f9e7e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c65f9e7e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c65f9e7e Branch: refs/heads/trunk Commit: c65f9e7ed7ecbc2b338ebff1ade45f7730da7b14 Parents: 1c017e0 Author: Aleksey Yeschenko <alek...@apache.org> Authored: Mon Mar 11 19:50:27 2013 +0300 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Mon Mar 11 19:50:27 2013 +0300 ---------------------------------------------------------------------- NEWS.txt | 2 ++ src/java/org/apache/cassandra/config/Config.java | 1 - .../cassandra/config/DatabaseDescriptor.java | 8 -------- 3 files changed, 2 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c65f9e7e/NEWS.txt ---------------------------------------------------------------------- diff --git a/NEWS.txt b/NEWS.txt index 250545e..d4b148b 100644 --- a/NEWS.txt +++ b/NEWS.txt @@ -20,6 +20,8 @@ Upgrading flush_largest_memtables_at options have been removed from cassandra.yaml. - CacheServiceMBean.reduceCacheSizes() has been removed. Use CacheServiceMBean.set{Key,Row}CacheCapacityInMB() instead. + - authority option in cassandra.yaml has been deprecated since 1.2.0, + but it has been completely removed in 2.0. Please use 'authorizer' option. 1.2.3 http://git-wip-us.apache.org/repos/asf/cassandra/blob/c65f9e7e/src/java/org/apache/cassandra/config/Config.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/config/Config.java b/src/java/org/apache/cassandra/config/Config.java index ce86609..368c5d6 100644 --- a/src/java/org/apache/cassandra/config/Config.java +++ b/src/java/org/apache/cassandra/config/Config.java @@ -34,7 +34,6 @@ public class Config { public String cluster_name = "Test Cluster"; public String authenticator; - public String authority; // for backwards compatibility - will log a warning. public String authorizer; public int permissions_validity_in_ms = 2000; http://git-wip-us.apache.org/repos/asf/cassandra/blob/c65f9e7e/src/java/org/apache/cassandra/config/DatabaseDescriptor.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java index ed3d207..0a5a77b 100644 --- a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java +++ b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java @@ -190,14 +190,6 @@ public class DatabaseDescriptor if (conf.authenticator != null) authenticator = FBUtilities.construct(conf.authenticator, "authenticator"); - if (conf.authority != null) - { - logger.warn("Please rename 'authority' to 'authorizer' in cassandra.yaml"); - if (!conf.authority.equals("org.apache.cassandra.auth.AllowAllAuthority")) - throw new ConfigurationException("IAuthority interface has been deprecated," - + " please implement IAuthorizer instead."); - } - if (conf.authorizer != null) authorizer = FBUtilities.construct(conf.authorizer, "authorizer");
