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 E459411FD8 for ; Fri, 18 Jul 2014 03:49:33 +0000 (UTC) Received: (qmail 34737 invoked by uid 500); 18 Jul 2014 03:49:33 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 34708 invoked by uid 500); 18 Jul 2014 03:49:33 -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 34699 invoked by uid 99); 18 Jul 2014 03:49:33 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 18 Jul 2014 03:49:33 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 3EF7E8C1C3F; Fri, 18 Jul 2014 03:49:33 +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: <3733e75159d8436ab9e3f10ef1e89ab6@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: updated refs/heads/4.4 to 72a6240 Date: Fri, 18 Jul 2014 03:49:33 +0000 (UTC) Repository: cloudstack Updated Branches: refs/heads/4.4 a72991a31 -> 72a62403d bogus db changes from previous conflict resolution Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/72a62403 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/72a62403 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/72a62403 Branch: refs/heads/4.4 Commit: 72a62403de63284e2f6d2391d3ebcffdc0240bc2 Parents: a72991a Author: Daan Hoogland Authored: Fri Jul 18 05:49:13 2014 +0200 Committer: Daan Hoogland Committed: Fri Jul 18 05:49:13 2014 +0200 ---------------------------------------------------------------------- setup/db/db/schema-430to440.sql | 11 ----------- 1 file changed, 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/72a62403/setup/db/db/schema-430to440.sql ---------------------------------------------------------------------- diff --git a/setup/db/db/schema-430to440.sql b/setup/db/db/schema-430to440.sql index 25d6eb9..9785871 100644 --- a/setup/db/db/schema-430to440.sql +++ b/setup/db/db/schema-430to440.sql @@ -2474,16 +2474,5 @@ CREATE TABLE `cloud`.`load_balancer_healthcheck_policy_details` ( CONSTRAINT `fk_lb_healthcheck_policy_details__lb_healthcheck_policy_id` FOREIGN KEY `fk_lb_healthcheck_policy_details__lb_healthcheck_policy_id`(`lb_policy_id`) REFERENCES `load_balancer_healthcheck_policies`(`id`) ON DELETE CASCADE ) ENGINE=InnoDB DEFAULT CHARSET=utf8; -ALTER TABLE `cloud`.`snapshot_policy` ADD COLUMN `display` tinyint(1) NOT NULL DEFAULT '1' COMMENT 'True if the policy can be displayed to the end user'; - -CREATE TABLE `cloud`.`snapshot_policy_details` ( - `id` bigint unsigned NOT NULL auto_increment, - `policy_id` bigint unsigned NOT NULL COMMENT 'snapshot policy id', - `name` varchar(255) NOT NULL, - `value` varchar(1024) NOT NULL, - `display` tinyint(1) NOT NULL DEFAULT '1' COMMENT 'True if the detail can be displayed to the end user', - PRIMARY KEY (`id`), - CONSTRAINT `fk_snapshot_policy_details__snapshot_policy_id` FOREIGN KEY `fk_snapshot_policy_details__snapshot_policy_id`(`policy_id`) REFERENCES `snapshot_policy`(`id`) ON DELETE CASCADE -) ENGINE=InnoDB DEFAULT CHARSET=utf8; INSERT INTO `cloud`.`configuration`(category, instance, component, name, value, description, default_value) VALUES ('Advanced', 'DEFAULT', 'management-server', 'vm.password.length', '6', 'Specifies the length of a randomly generated password', '6') ON DUPLICATE KEY UPDATE category='Advanced';