This is an automated email from the ASF dual-hosted git repository. pearl11594 pushed a change to branch netris-integration-upstream in repository https://gitbox.apache.org/repos/asf/cloudstack.git
from 127667ffb81 VPC: Fix tier creation failure for IPv4 due to incorrect destination prefix add be22bfe2c9d Management Server - Prepare for Maintenance and Cancel Maintenance improvements (#10995) add 8f2735ab462 Accept case insensitive values in boolean settings (#10663) add 5790091b25d [Vmware to KVM Migration] Improve the Force MS option text (#11035) add 75147b78116 [Vmware to KVM Migration] Display virt-v2v and ovftool versions for supported hosts for migration (#11019) add ba0204f8edd Block volume shrink on Xen (#11004) add 544028ca8e6 Do not rely on Memory engine even transiently in DB setup scripts (#11106) add 3b54194aef1 Correct quota type indexes (#11085) add c24e4eea855 server: fix orphan db transaction issue (#11095) add cbd2b5a0224 Add check for ldap truststore password (#11055) add 7cad65d310d Merge release branch 4.19 to 4.20 add 1a251c8b789 merge forward fix add 3e3a0c06781 Merge branch '4.20' add aca1a1f8cef Merge branch 'main' of https://github.com/apache/cloudstack into netris-integration-upstream No new revisions were added by this update. Summary of changes: agent/src/main/java/com/cloud/agent/Agent.java | 32 ++- .../exception/OperationTimedoutException.java | 2 +- api/src/main/java/com/cloud/host/Host.java | 9 +- .../java/com/cloud/resource/ResourceState.java | 7 +- .../org/apache/cloudstack/api/ApiConstants.java | 1 + .../command/admin/systemvm/PatchSystemVMCmd.java | 4 +- .../cloudstack/agent/lb/SetupMSListCommand.java | 9 +- .../main/java/com/cloud/agent/AgentManager.java | 2 +- .../com/cloud/agent/manager/AgentManagerImpl.java | 22 +- .../agent/manager/ClusteredAgentManagerImpl.java | 30 +- .../src/main/java/com/cloud/host/dao/HostDao.java | 18 +- .../main/java/com/cloud/host/dao/HostDaoImpl.java | 42 ++- .../cloudstack/agent/lb/IndirectAgentLB.java | 8 +- .../kvm/resource/LibvirtComputingResource.java | 29 +- .../wrapper/LibvirtReadyCommandWrapper.java | 8 + .../xenbase/CitrixResizeVolumeCommandWrapper.java | 7 +- .../api/command/CancelMaintenanceCmd.java | 10 + .../api/command/PrepareForMaintenanceCmd.java | 8 + .../ManagementServerMaintenanceManager.java | 13 +- .../ManagementServerMaintenanceManagerImpl.java | 159 ++++++++--- ...eForMaintenanceManagementServerHostCommand.java | 8 +- ...ManagementServerMaintenanceManagerImplTest.java | 36 ++- .../apache/cloudstack/ldap/LdapContextFactory.java | 40 ++- .../apache/cloudstack/ldap/LdapManagerImpl.java | 5 + .../java/com/cloud/alert/AlertManagerImpl.java | 32 ++- .../configuration/ConfigurationManagerImpl.java | 313 ++++++++++----------- .../java/com/cloud/storage/StorageManagerImpl.java | 36 ++- .../com/cloud/storage/VolumeApiServiceImpl.java | 3 + .../agent/lb/IndirectAgentLBServiceImpl.java | 107 +++++-- .../ConfigurationManagerImplTest.java | 111 ++++++++ .../agent/lb/IndirectAgentLBServiceImplTest.java | 4 +- setup/db/create-schema.sql | 4 +- ui/public/locales/en.json | 5 +- ui/src/config/section/infra/managementServers.js | 2 +- ui/src/utils/quota.js | 4 +- ui/src/views/AutogenView.vue | 8 +- ui/src/views/infra/Confirmation.vue | 7 + ui/src/views/infra/HostInfo.vue | 16 ++ ui/src/views/storage/ChangeOfferingForVolume.vue | 2 +- ui/src/views/tools/ImportUnmanagedInstance.vue | 6 + .../java/com/cloud/utils/nio/NioConnection.java | 2 +- 41 files changed, 836 insertions(+), 335 deletions(-)