Updated Branches: refs/heads/4.2 53eb46990 -> 2814d2360
CLOUDSTACK-5084: added missing global config vmware.hung.wokervm.timeout to the 4.2-4.2.1 upgrade path Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/2814d236 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/2814d236 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/2814d236 Branch: refs/heads/4.2 Commit: 2814d2360e13bb907bc21776094a5be5655c0aec Parents: 53eb469 Author: Alena Prokharchyk <alena.prokharc...@citrix.com> Authored: Mon Nov 11 16:29:22 2013 -0800 Committer: Alena Prokharchyk <alena.prokharc...@citrix.com> Committed: Mon Nov 11 16:29:22 2013 -0800 ---------------------------------------------------------------------- setup/db/db/schema-420to421.sql | 1 + 1 file changed, 1 insertion(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2814d236/setup/db/db/schema-420to421.sql ---------------------------------------------------------------------- diff --git a/setup/db/db/schema-420to421.sql b/setup/db/db/schema-420to421.sql index baadbda..1d28485 100644 --- a/setup/db/db/schema-420to421.sql +++ b/setup/db/db/schema-420to421.sql @@ -223,3 +223,4 @@ update `cloud`.`volumes` v, `cloud`.`volume_host_ref` vhr set v.format=vhr.fo INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Advanced', 'DEFAULT', 'management-server', 'baremetal.ipmi.lan.interface', 'default', 'option specified in -I option of impitool. candidates are: open/bmc/lipmi/lan/lanplus/free/imb, see ipmitool man page for details. default valule "default" means using default option of ipmitool'); INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Advanced', 'DEFAULT', 'management-server', 'baremetal.ipmi.fail.retry', 'default', "ipmi interface will be temporary out of order after power opertions(e.g. cycle, on), it leads following commands fail immediately. The value specifies retry times before accounting it as real failure"); +INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Advanced', 'DEFAULT', 'management-server', 'vmware.hung.wokervm.timeout', '7200', 'Worker VM timeout in seconds');