Updated Branches: refs/heads/cs2163 e107776d7 -> fa1217576
db conflict resolve Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/fa121757 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/fa121757 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/fa121757 Branch: refs/heads/cs2163 Commit: fa1217576bda168d969422ce1f9dd6f87615e047 Parents: e107776 Author: Nitin Mehta <nitin.me...@citrix.com> Authored: Sun May 12 13:59:14 2013 +0530 Committer: Nitin Mehta <nitin.me...@citrix.com> Committed: Sun May 12 13:59:14 2013 +0530 ---------------------------------------------------------------------- setup/db/db/schema-410to420.sql | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/fa121757/setup/db/db/schema-410to420.sql ---------------------------------------------------------------------- diff --git a/setup/db/db/schema-410to420.sql b/setup/db/db/schema-410to420.sql index 5bb1eaa..30b96fd 100644 --- a/setup/db/db/schema-410to420.sql +++ b/setup/db/db/schema-410to420.sql @@ -1204,7 +1204,6 @@ INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Advanced', 'DEFAULT', 'Netwo alter table `cloud_usage`.`usage_network_offering` add column nic_id bigint(20) unsigned NOT NULL; -<<<<<<< HEAD DROP VIEW IF EXISTS `cloud`.`disk_offering_view`; CREATE VIEW `cloud`.`disk_offering_view` AS select @@ -1514,7 +1513,6 @@ CREATE VIEW `cloud`.`volume_view` AS and async_job.instance_type = 'Volume' and async_job.job_status = 0; -======= ALTER TABLE `cloud`.`data_center_details` MODIFY value varchar(1024); ALTER TABLE `cloud`.`cluster_details` MODIFY value varchar(255); ALTER TABLE `cloud`.`storage_pool_details` MODIFY value varchar(255); @@ -1541,4 +1539,3 @@ CREATE TABLE `cloud`.`account_vnet_map` ( ALTER TABLE `cloud`.`op_dc_vnet_alloc` ADD COLUMN account_vnet_map_id bigint unsigned; ALTER TABLE `cloud`.`op_dc_vnet_alloc` ADD CONSTRAINT `fk_op_dc_vnet_alloc__account_vnet_map_id` FOREIGN KEY `fk_op_dc_vnet_alloc__account_vnet_map_id` (`account_vnet_map_id`) REFERENCES `account_vnet_map` (`id`); ->>>>>>> master
