This is an automated email from the ASF dual-hosted git repository. pearl11594 pushed a commit to branch nsx-integration in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit 271ed0f33a01bf4e92530cb346da3acf64b2f667 Merge: d378130782d f6b2a587272 Author: Pearl Dsilva <[email protected]> AuthorDate: Thu Sep 7 14:03:24 2023 -0400 Merge branch 'main' of https://github.com/apache/cloudstack into nsx-integration .../download/HttpsDirectTemplateDownloader.java | 3 +- debian/rules | 2 +- .../cloud/upgrade/dao/DatabaseAccessObject.java | 29 +++++++++- .../java/com/cloud/upgrade/dao/DbUpgradeUtils.java | 8 +++ .../com/cloud/upgrade/dao/Upgrade41800to41810.java | 5 ++ .../upgrade/dao/DatabaseAccessObjectTest.java | 61 ++++++++++++++++++++++ packaging/centos7/cloud.spec | 2 +- packaging/centos8/cloud.spec | 2 +- .../hypervisor/kvm/resource/LibvirtConnection.java | 2 - .../resource/wrapper/LibvirtCheckUrlCommand.java | 5 ++ .../cloud/network/guru/VxlanGuestNetworkGuru.java | 5 +- .../datastore/client/ScaleIOGatewayClientImpl.java | 19 +++++-- .../network/guru/ExternalGuestNetworkGuru.java | 18 +------ .../com/cloud/network/guru/GuestNetworkGuru.java | 18 +++++++ .../storage/template/DownloadManagerImpl.java | 2 +- ui/src/views/AutogenView.vue | 4 -- utils/pom.xml | 2 +- .../java/com/cloud/utils/storage/QCOW2Utils.java | 42 ++++++++------- .../com/cloud/utils/storage/QCOW2UtilsTest.java | 6 +-- 19 files changed, 173 insertions(+), 62 deletions(-)
