Updated Branches: refs/heads/master 5b5a61754 -> bf6a5ff02
Added a ManagementServer scope but it isn't used yet. Added @Deprecated to one of the constructors Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/bf6a5ff0 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/bf6a5ff0 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/bf6a5ff0 Branch: refs/heads/master Commit: bf6a5ff023f84c53d0195833a48540ec56249e52 Parents: 5b5a617 Author: Alex Huang <alex.hu...@citrix.com> Authored: Wed Sep 18 09:34:24 2013 -0700 Committer: Alex Huang <alex.hu...@citrix.com> Committed: Wed Sep 18 09:34:24 2013 -0700 ---------------------------------------------------------------------- .../src/org/apache/cloudstack/framework/config/ConfigKey.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bf6a5ff0/framework/config/src/org/apache/cloudstack/framework/config/ConfigKey.java ---------------------------------------------------------------------- diff --git a/framework/config/src/org/apache/cloudstack/framework/config/ConfigKey.java b/framework/config/src/org/apache/cloudstack/framework/config/ConfigKey.java index c13d861..913ec95 100644 --- a/framework/config/src/org/apache/cloudstack/framework/config/ConfigKey.java +++ b/framework/config/src/org/apache/cloudstack/framework/config/ConfigKey.java @@ -32,7 +32,7 @@ import com.cloud.utils.exception.CloudRuntimeException; public class ConfigKey<T> { public static enum Scope { - Global, Zone, Cluster, StoragePool, Account + Global, Zone, Cluster, StoragePool, Account, ManagementServer } private final String _category; @@ -104,6 +104,7 @@ public class ConfigKey<T> { _multiplier = multiplier; } + @Deprecated public ConfigKey(Class<T> type, String name, String category, String defaultValue, String description, boolean isDynamic) { this(type, name, category, defaultValue, description, isDynamic, Scope.Global, null); }