From 72a62403de63284e2f6d2391d3ebcffdc0240bc2 Mon Sep 17 00:00:00 2001 From: Daan Hoogland Date: Fri, 18 Jul 2014 05:49:13 +0200 Subject: [PATCH] bogus db changes from previous conflict resolution --- setup/db/db/schema-430to440.sql | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/setup/db/db/schema-430to440.sql b/setup/db/db/schema-430to440.sql index 25d6eb9bf68..97858714d85 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';