You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ed...@apache.org on 2013/11/20 02:57:02 UTC
git commit: updated refs/heads/master to 8321ea4
Updated Branches:
refs/heads/master 465626f6d -> 8321ea4d7
add mgt.server.vendor global configuration, in case different vendor wants to identify its identity
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/8321ea4d
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/8321ea4d
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/8321ea4d
Branch: refs/heads/master
Commit: 8321ea4d78448016adf464ad00c3e39260350290
Parents: 465626f
Author: fjkdf <fj...@fjkd.com>
Authored: Tue Nov 19 17:55:29 2013 -0800
Committer: fjkdf <fj...@fjkd.com>
Committed: Tue Nov 19 17:55:58 2013 -0800
----------------------------------------------------------------------
server/src/com/cloud/configuration/Config.java | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8321ea4d/server/src/com/cloud/configuration/Config.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/configuration/Config.java b/server/src/com/cloud/configuration/Config.java
index 640e7fa..2178356 100755
--- a/server/src/com/cloud/configuration/Config.java
+++ b/server/src/com/cloud/configuration/Config.java
@@ -413,9 +413,11 @@ public enum Config {
ExecuteInSequenceNetworkElementCommands("Advanced", NetworkOrchestrationService.class, Boolean.class, "execute.in.sequence.network.element.commands", "false", "If set to true, DhcpEntryCommand, SavePasswordCommand, UserDataCommand, VmDataCommand will be synchronized on the agent side." +
" If set to false, these commands become asynchronous. Default value is false.", null),
- UCSSyncBladeInterval("Advanced", ManagementServer.class, Integer.class, "ucs.sync.blade.interval", "3600", "the interval cloudstack sync with UCS manager for available blades in case user remove blades from chassis without notifying CloudStack", null);
+ UCSSyncBladeInterval("Advanced", ManagementServer.class, Integer.class, "ucs.sync.blade.interval", "3600", "the interval cloudstack sync with UCS manager for available blades in case user remove blades from chassis without notifying CloudStack", null),
- private final String _category;
+ ManagementServerVendor("Advanced", ManagementServer.class, String.class, "mgt.server.vendor", "ACS", "the vendor of management server", null);
+
+ private final String _category;
private final Class<?> _componentClass;
private final Class<?> _type;
private final String _name;