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 12503999D for ; Thu, 18 Dec 2014 11:24:14 +0000 (UTC) Received: (qmail 37395 invoked by uid 500); 18 Dec 2014 11:24:13 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 37366 invoked by uid 500); 18 Dec 2014 11:24:13 -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 37357 invoked by uid 99); 18 Dec 2014 11:24:13 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 18 Dec 2014 11:24:13 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 94898956A2E; Thu, 18 Dec 2014 11:24:13 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: dahn@apache.org To: commits@cloudstack.apache.org Message-Id: <507a44a7f442460e886d35a4c109366e@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: updated refs/heads/4.4 to 86c425e Date: Thu, 18 Dec 2014 11:24:13 +0000 (UTC) Repository: cloudstack Updated Branches: refs/heads/4.4 8dfcd51be -> 86c425ec8 CLOUDSTACK-7184 c&p feature fix in conf-value-description Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/86c425ec Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/86c425ec Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/86c425ec Branch: refs/heads/4.4 Commit: 86c425ec839ccc14fe323b48b875753633675e3f Parents: 8dfcd51 Author: Daan Hoogland Authored: Thu Dec 18 12:23:53 2014 +0100 Committer: Daan Hoogland Committed: Thu Dec 18 12:23:53 2014 +0100 ---------------------------------------------------------------------- setup/db/db/schema-442to443.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/86c425ec/setup/db/db/schema-442to443.sql ---------------------------------------------------------------------- diff --git a/setup/db/db/schema-442to443.sql b/setup/db/db/schema-442to443.sql index ab8ebde..d871bfa 100644 --- a/setup/db/db/schema-442to443.sql +++ b/setup/db/db/schema-442to443.sql @@ -19,4 +19,4 @@ -- Schema upgrade from 4.4.2 to 4.4.3; --; -INSERT IGNORE INTO `cloud`.`configuration` (`category`, `instance`, `component`, `name`, `value`, `default`, `description`) VALUES ('Advanced', 'DEFAULT', 'ManagementServer', 'xen.heartbeat.timeout' , '180', '120', 'If set to true, creates VMs as full clones on ESX hypervisor'); +INSERT IGNORE INTO `cloud`.`configuration` (`category`, `instance`, `component`, `name`, `value`, `default`, `description`) VALUES ('Advanced', 'DEFAULT', 'ManagementServer', 'xen.heartbeat.timeout' , '180', '120', 'Timeout value to send to the xenheartbeat script for guarding the self fencing functionality');