Updated Branches: refs/heads/master 11c5574b0 -> 21d2e89dc
CLOUDSTACK-5966 enable/disable global setting for service monitor in VR corrected merged lines in sql file Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/21d2e89d Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/21d2e89d Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/21d2e89d Branch: refs/heads/master Commit: 21d2e89dc1579e3f4a2e2e6afc3cf0d984d397e0 Parents: 11c5574 Author: Jayapal <jaya...@apache.org> Authored: Tue Feb 11 16:24:17 2014 +0530 Committer: Jayapal <jaya...@apache.org> Committed: Tue Feb 11 16:24:21 2014 +0530 ---------------------------------------------------------------------- setup/db/db/schema-430to440.sql | 3 --- 1 file changed, 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/21d2e89d/setup/db/db/schema-430to440.sql ---------------------------------------------------------------------- diff --git a/setup/db/db/schema-430to440.sql b/setup/db/db/schema-430to440.sql index c584836..d1d0d06 100644 --- a/setup/db/db/schema-430to440.sql +++ b/setup/db/db/schema-430to440.sql @@ -468,7 +468,6 @@ CREATE TABLE `cloud`.`autoscale_vmgroup_details` ( CONSTRAINT `fk_autoscale_vmgroup_details__autoscale_vmgroup_id` FOREIGN KEY `fk_autoscale_vmgroup_details__autoscale_vmgroup_id`(`autoscale_vmgroup_id`) REFERENCES `autoscale_vmgroups`(`id`) ON DELETE CASCADE ) ENGINE=InnoDB DEFAULT CHARSET=utf8; -<<<<<<< Updated upstream ALTER TABLE `cloud`.`snapshot_details` ADD COLUMN `display` tinyint(1) NOT NULL DEFAULT '1' COMMENT 'True if the detail can be displayed to the end user'; ALTER TABLE `cloud`.`vm_snapshot_details` ADD COLUMN `display` tinyint(1) NOT NULL DEFAULT '1' COMMENT 'True if the detail can be displayed to the end user'; @@ -528,5 +527,3 @@ UPDATE `cloud`.`vpc_details` set `display`=1 where id> 0; ALTER TABLE `cloud`.`vpc_gateway_details` CHANGE `display` `display` tinyint(1) NOT NULL DEFAULT '1' COMMENT 'True if the detail can be displayed to the end user'; UPDATE `cloud`.`vpc_gateway_details` set `display`=1 where id> 0; -======= ->>>>>>> Stashed changes
