This is an automated email from the ASF dual-hosted git repository. sureshanaparti pushed a commit to branch 4.22 in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit 000919d6e5de328d45fdfdfce07d27ded1d7dda2 Merge: b1f870ae833 8db065a14eb Author: Suresh Kumar Anaparti <[email protected]> AuthorDate: Mon Jan 26 12:46:09 2026 +0530 Merge branch '4.20' into 4.22 .../cloudstack/api/BaseUpdateTemplateOrIsoCmd.java | 2 +- .../admin/network/UpdateNetworkOfferingCmd.java | 1 + .../admin/offering/UpdateDiskOfferingCmd.java | 1 + .../admin/offering/UpdateServiceOfferingCmd.java | 1 + .../command/admin/vpc/UpdateVPCOfferingCmd.java | 1 + .../api/command/user/iso/RegisterIsoCmd.java | 2 +- .../com/cloud/upgrade/dao/Upgrade42020to42030.java | 64 ++++++++++++++++++++++ .../vm/schedule/dao/VMScheduledJobDao.java | 2 + .../vm/schedule/dao/VMScheduledJobDaoImpl.java | 15 +++++ ...ma-42200to42210.sql => schema-42020to42030.sql} | 9 +-- .../resources/META-INF/db/schema-42200to42210.sql | 2 + .../java/com/cloud/utils/db/GenericDaoBase.java | 15 +++-- .../cloudstack/vm/schedule/VMSchedulerImpl.java | 8 ++- ui/public/locales/en.json | 2 +- ui/src/config/section/network.js | 5 +- ui/src/utils/plugins.js | 13 +++-- ui/src/views/compute/DeployVnfAppliance.vue | 2 +- ui/src/views/image/RegisterOrUploadTemplate.vue | 6 +- ui/src/views/network/VnfAppliancesTab.vue | 2 +- .../main/java/com/cloud/utils/script/Script.java | 22 ++++++++ 20 files changed, 146 insertions(+), 29 deletions(-) diff --cc engine/schema/src/main/resources/META-INF/db/schema-42200to42210.sql index 6aafa7ba81e,00000000000..f5543756ed6 mode 100644,000000..100644 --- a/engine/schema/src/main/resources/META-INF/db/schema-42200to42210.sql +++ b/engine/schema/src/main/resources/META-INF/db/schema-42200to42210.sql @@@ -1,27 -1,0 +1,29 @@@ +-- Licensed to the Apache Software Foundation (ASF) under one +-- or more contributor license agreements. See the NOTICE file +-- distributed with this work for additional information +-- regarding copyright ownership. The ASF licenses this file +-- to you under the Apache License, Version 2.0 (the +-- "License"); you may not use this file except in compliance +-- with the License. You may obtain a copy of the License at +-- +-- http://www.apache.org/licenses/LICENSE-2.0 +-- +-- Unless required by applicable law or agreed to in writing, +-- software distributed under the License is distributed on an +-- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +-- KIND, either express or implied. See the License for the +-- specific language governing permissions and limitations +-- under the License. + +--; +-- Schema upgrade from 4.22.0.0 to 4.22.1.0 +--; + +-- Add vm_id column to usage_event table for volume usage events +CALL `cloud`.`IDEMPOTENT_ADD_COLUMN`('cloud.usage_event','vm_id', 'bigint UNSIGNED NULL COMMENT "VM ID associated with volume usage events"'); +CALL `cloud_usage`.`IDEMPOTENT_ADD_COLUMN`('cloud_usage.usage_event','vm_id', 'bigint UNSIGNED NULL COMMENT "VM ID associated with volume usage events"'); + +-- Add vm_id column to cloud_usage.usage_volume table +CALL `cloud_usage`.`IDEMPOTENT_ADD_COLUMN`('cloud_usage.usage_volume','vm_id', 'bigint UNSIGNED NULL COMMENT "VM ID associated with the volume usage"'); ++ ++ALTER TABLE `cloud`.`template_store_ref` MODIFY COLUMN `download_url` varchar(2048);
