From 38db7a45dd4c4eddf61d2e210cf34c4a4b672c49 Mon Sep 17 00:00:00 2001 From: alena Date: Mon, 1 Aug 2011 15:31:16 -0700 Subject: [PATCH] bug 10927: removed network_domain for account/domain as this feature is not in 2.2.9, but in 2.2.10 Conflicts: setup/db/db/schema-228to229.sql --- setup/db/db/schema-228to229.sql | 1 + 1 file changed, 1 insertion(+) diff --git a/setup/db/db/schema-228to229.sql b/setup/db/db/schema-228to229.sql index 9846fcfd455..7d1ab0efed6 100644 --- a/setup/db/db/schema-228to229.sql +++ b/setup/db/db/schema-228to229.sql @@ -7,6 +7,7 @@ ALTER TABLE `cloud`.`domain` ADD COLUMN `network_domain` varchar(255); ALTER TABLE `cloud`.`cluster` ADD CONSTRAINT `fk_cluster__data_center_id` FOREIGN KEY (`data_center_id`) REFERENCES `cloud`.`data_center`(`id`) ON DELETE CASCADE; + INSERT IGNORE INTO configuration VALUES ('Advanced', 'DEFAULT', 'NetworkManager', 'network.dns.basiczone.updates', 'all', 'This parameter can take 2 values: all (default) and pod. It defines if DHCP/DNS requests have to be send to all dhcp servers in cloudstack, or only to the one in the same pod'); ALTER TABLE `cloud`.`op_host_capacity` DROP FOREIGN KEY `fk_op_host_capacity__pod_id`;