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
This commit is contained in:
alena 2011-08-01 15:31:16 -07:00
parent 0bc6026d6b
commit 38db7a45dd

View File

@ -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`;