cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mc...@apache.org
Subject git commit: updated refs/heads/4.2-forward to 5a11fe7
Date Mon, 26 Aug 2013 22:52:44 GMT
Updated Branches:
  refs/heads/4.2-forward ad6fc9f68 -> 5a11fe77b


CLOUDSTACK-3405: execute.in.sequence.hypervisor.commands and
execute.in.sequence.network.element.commands should be set to "true" by
default.

Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/5a11fe77
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/5a11fe77
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/5a11fe77

Branch: refs/heads/4.2-forward
Commit: 5a11fe77bae1966c986e541e484ae3d56485d78f
Parents: ad6fc9f
Author: Min Chen <min.chen@citrix.com>
Authored: Mon Aug 26 15:52:24 2013 -0700
Committer: Min Chen <min.chen@citrix.com>
Committed: Mon Aug 26 15:52:24 2013 -0700

----------------------------------------------------------------------
 server/src/com/cloud/configuration/Config.java | 8 ++++----
 setup/db/db/schema-410to420.sql                | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5a11fe77/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 8955087..1cc31b6 100755
--- a/server/src/com/cloud/configuration/Config.java
+++ b/server/src/com/cloud/configuration/Config.java
@@ -435,10 +435,10 @@ public enum Config {
 	           "routes", ConfigurationParameterScope.zone.toString()),
 	
     InternalLbVmServiceOfferingId("Advanced", ManagementServer.class, String.class, "internallbvm.service.offering",
null, "Uuid of the service offering used by internal lb vm; if NULL - default system internal
lb offering will be used", null),
-    ExecuteInSequence("Advanced", ManagementServer.class, Boolean.class, "execute.in.sequence.hypervisor.commands",
"false", "If set to true, StartCommand, StopCommand, CopyCommand will be synchronized on the
agent side." +
-    		" If set to false, these commands become asynchronous. Default value is false.", null),
-    ExecuteInSequenceNetworkElementCommands("Advanced", NetworkManager.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),
+    ExecuteInSequence("Advanced", ManagementServer.class, Boolean.class, "execute.in.sequence.hypervisor.commands",
"true", "If set to true, StartCommand, StopCommand, CopyCommand will be synchronized on the
agent side." +
+    		" If set to false, these commands become asynchronous. Default value is true.", null),
+    ExecuteInSequenceNetworkElementCommands("Advanced", NetworkManager.class, Boolean.class,
"execute.in.sequence.network.element.commands", "true", "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 true.",
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);
 	

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5a11fe77/setup/db/db/schema-410to420.sql
----------------------------------------------------------------------
diff --git a/setup/db/db/schema-410to420.sql b/setup/db/db/schema-410to420.sql
index 57051ff..c29fd86 100644
--- a/setup/db/db/schema-410to420.sql
+++ b/setup/db/db/schema-410to420.sql
@@ -2170,8 +2170,8 @@ UPDATE `cloud`.`networks` set name='Shared SG enabled network', display_text='Sh
 INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Advanced', 'DEFAULT', 'management-server',
'use.system.public.ips', 'true', 'If true, when account has dedicated public ip range(s),
once the ips dedicated to the account have been consumed ips will be acquired from the system
pool');
 INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Advanced', 'DEFAULT', 'management-server',
'use.system.guest.vlans', 'true', 'If true, when account has dedicated guest vlan range(s),
once the vlans dedicated to the account have been consumed vlans will be allocated from the
system pool');
 
-INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Advanced', 'DEFAULT', 'management-server',
'execute.in.sequence.hypervisor.commands', 'false', 'If set to true, StartCommand, StopCommand,
CopyCommand will be synchronized on the agent side. If set to false, these commands become
asynchronous. Default value is false.');
-INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Advanced', 'DEFAULT', 'management-server',
'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.');
+INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Advanced', 'DEFAULT', 'management-server',
'execute.in.sequence.hypervisor.commands', 'true', 'If set to true, StartCommand, StopCommand,
CopyCommand will be synchronized on the agent side. If set to false, these commands become
asynchronous. Default value is true.');
+INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Advanced', 'DEFAULT', 'management-server',
'execute.in.sequence.network.element.commands', 'true', '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 true.');
 
 INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Advanced', 'DEFAULT', 'management-server',
'direct.agent.scan.interval', 90, 'Time interval (in seconds) to run the direct agent scan
task.');
 


Mime
View raw message