This is an automated email from the ASF dual-hosted git repository. sureshanaparti pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit 4bcf3ea57d9d30262cd6b7113b531e3e88b958e9 Merge: 420bf6dff84 000919d6e5d Author: Suresh Kumar Anaparti <[email protected]> AuthorDate: Mon Jan 26 12:46:54 2026 +0530 Merge branch '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(-)
