Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 81CAD10F91 for ; Tue, 12 Nov 2013 00:30:35 +0000 (UTC) Received: (qmail 48690 invoked by uid 500); 12 Nov 2013 00:30:35 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 48669 invoked by uid 500); 12 Nov 2013 00:30:35 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 48662 invoked by uid 99); 12 Nov 2013 00:30:35 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 12 Nov 2013 00:30:35 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 1B6838A5226; Tue, 12 Nov 2013 00:30:35 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: alena1108@apache.org To: commits@cloudstack.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: git commit: updated refs/heads/4.3 to 9e92206 Date: Tue, 12 Nov 2013 00:30:35 +0000 (UTC) Updated Branches: refs/heads/4.3 a888a6950 -> 9e92206e6 CLOUDSTACK-5084: added missing global config vmware.hung.wokervm.timeout to the 4.2-4.2.1 upgrade path Conflicts: setup/db/db/schema-420to421.sql Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/9e92206e Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/9e92206e Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/9e92206e Branch: refs/heads/4.3 Commit: 9e92206e640faf067647a74e55cdbe9707140d71 Parents: a888a69 Author: Alena Prokharchyk Authored: Mon Nov 11 16:29:22 2013 -0800 Committer: Alena Prokharchyk Committed: Mon Nov 11 16:30:58 2013 -0800 ---------------------------------------------------------------------- setup/db/db/schema-420to421.sql | 3 +++ 1 file changed, 3 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9e92206e/setup/db/db/schema-420to421.sql ---------------------------------------------------------------------- diff --git a/setup/db/db/schema-420to421.sql b/setup/db/db/schema-420to421.sql index d429b30..1d28485 100644 --- a/setup/db/db/schema-420to421.sql +++ b/setup/db/db/schema-420to421.sql @@ -221,3 +221,6 @@ CREATE VIEW `cloud`.`user_vm_view` AS update `cloud`.`volumes` v, `cloud`.`volume_host_ref` vhr set v.format=vhr.format where v.id=vhr.volume_id and v.format is null; +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');