cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From edi...@apache.org
Subject git commit: updated refs/heads/4.3 to 7ed2a21
Date Wed, 20 Nov 2013 02:03:02 GMT
Updated Branches:
  refs/heads/4.3 a4d6c10cb -> 7ed2a21c2


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/7ed2a21c
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/7ed2a21c
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/7ed2a21c

Branch: refs/heads/4.3
Commit: 7ed2a21c29ef351463099bed6810151fd32e8970
Parents: a4d6c10
Author: fjkdf <fjkd@fjkd.com>
Authored: Tue Nov 19 17:55:29 2013 -0800
Committer: Edison Su <sudison@gmail.com>
Committed: Tue Nov 19 18:01:45 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/7ed2a21c/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 fd26ff0..93a4606 100755
--- a/server/src/com/cloud/configuration/Config.java
+++ b/server/src/com/cloud/configuration/Config.java
@@ -415,9 +415,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;


Mime
View raw message