Merge remote-tracking branch 'origin/4.14'

This commit is contained in:
Rohit Yadav 2020-12-14 12:05:52 +05:30
commit fdf9573266
2 changed files with 4 additions and 4 deletions

View File

@ -1288,7 +1288,7 @@ UPDATE `cloud`.`account` SET `cloud`.`account`.`default`=1 WHERE id IN (1,2);
UPDATE `cloud_usage`.`account` SET `default`=1 WHERE id IN (1,2);
UPDATE `cloud`.`user` SET `cloud`.`user`.`default`=1 WHERE id IN (1,2);
ALTER VIEW `cloud`.`user_view` AS
CREATE OR REPLACE VIEW `cloud`.`user_view` AS
select
user.id,
user.uuid,

View File

@ -60,7 +60,7 @@ alter table `cloud`.`disk_offering` add `iops_read_rate_max_length` bigint(20) d
alter table `cloud`.`disk_offering` add `iops_write_rate_max` bigint(20) default null after `iops_write_rate`;
alter table `cloud`.`disk_offering` add `iops_write_rate_max_length` bigint(20) default null after `iops_write_rate_max`;
ALTER VIEW `cloud`.`disk_offering_view` AS
CREATE OR REPLACE VIEW `cloud`.`disk_offering_view` AS
SELECT
`disk_offering`.`id` AS `id`,
`disk_offering`.`uuid` AS `uuid`,
@ -105,7 +105,7 @@ ALTER VIEW `cloud`.`disk_offering_view` AS
(`disk_offering`.`state` = 'ACTIVE');
ALTER VIEW `cloud`.`service_offering_view` AS
CREATE OR REPLACE VIEW `cloud`.`service_offering_view` AS
SELECT
`service_offering`.`id` AS `id`,
`disk_offering`.`uuid` AS `uuid`,
@ -159,4 +159,4 @@ ALTER VIEW `cloud`.`service_offering_view` AS
(`disk_offering`.`state` = 'Active');
-- PR#2578 New column for listManagementServers API call
ALTER TABLE `mshost` ADD COLUMN `uuid` varchar(40) AFTER `name`;
ALTER TABLE `mshost` ADD COLUMN `uuid` varchar(40) AFTER `name`;