This is an automated email from the ASF dual-hosted git repository. dahn pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit cb822feb72487bc6a4ef6a799a3a20e062771f99 Merge: d6c192c0f08 75db42bca6a Author: Daan Hoogland <[email protected]> AuthorDate: Tue Jan 27 16:21:59 2026 +0100 Merge branch '4.22' .../java/com/cloud/network/NetworkService.java | 4 ++ .../api/command/admin/host/ListHostsCmd.java | 7 ++ .../api/command/admin/management/ListMgmtsCmd.java | 8 +++ .../command/user/backup/ListBackupScheduleCmd.java | 1 - .../api/command/user/vm/DeployVnfApplianceCmd.java | 2 +- .../storage/template/VnfTemplateManager.java | 4 +- .../storage/template/VnfTemplateUtils.java | 18 +++++ .../java/org/apache/cloudstack/ACSRequestLog.java | 7 +- .../java/org/apache/cloudstack/ServerDaemon.java | 19 ------ debian/control | 2 +- .../java/com/cloud/resource/ResourceManager.java | 5 ++ .../java/com/cloud/template/TemplateManager.java | 2 + .../cloud/vm/VirtualMachinePowerStateSyncImpl.java | 6 +- .../storage/image/TemplateServiceImpl.java | 37 +++++++--- .../storage/image/TemplateServiceImplTest.java | 55 ++++++++------- .../kvm/resource/LibvirtDomainXMLParser.java | 4 +- .../CitrixUpdateHostPasswordCommandWrapper.java | 2 +- .../cluster/KubernetesClusterManagerImpl.java | 7 +- .../apache/cloudstack/saml/SAML2AuthManager.java | 3 + .../cloudstack/saml/SAML2AuthManagerImpl.java | 9 ++- server/src/main/java/com/cloud/api/ApiServlet.java | 34 ++++------ .../java/com/cloud/api/query/QueryManagerImpl.java | 16 +++++ .../cloud/api/query/dao/TemplateJoinDaoImpl.java | 79 ++++++++++++---------- .../main/java/com/cloud/configuration/Config.java | 7 -- .../java/com/cloud/network/NetworkServiceImpl.java | 12 ++++ .../router/VirtualNetworkApplianceManagerImpl.java | 5 +- .../com/cloud/resource/ResourceManagerImpl.java | 18 ++--- .../com/cloud/server/ManagementServerImpl.java | 14 ++-- .../cloud/template/HypervisorTemplateAdapter.java | 12 +++- .../com/cloud/template/TemplateManagerImpl.java | 20 ++++++ .../main/java/com/cloud/vm/UserVmManagerImpl.java | 2 +- .../storage/template/VnfTemplateManagerImpl.java | 21 +++++- .../test/java/com/cloud/api/ApiServletTest.java | 71 +++++++++++++------ .../template/HypervisorTemplateAdapterTest.java | 27 +------- .../cloud/template/TemplateManagerImplTest.java | 28 ++++++++ .../java/com/cloud/vm/UserVmManagerImplTest.java | 10 +-- .../java/com/cloud/vpc/MockNetworkManagerImpl.java | 7 ++ .../template/VnfTemplateManagerImplTest.java | 8 +-- tools/marvin/marvin/lib/base.py | 3 +- ui/public/locales/en.json | 5 +- ui/public/locales/pt_BR.json | 8 +++ ui/src/components/view/DeployVMFromBackup.vue | 4 +- ui/src/components/view/StatsTab.vue | 68 ++++++++++++------- ui/src/views/compute/DeployVnfAppliance.vue | 14 +++- ui/src/views/compute/wizard/VnfNicsSelection.vue | 5 ++ 45 files changed, 462 insertions(+), 238 deletions(-)
