This is an automated email from the ASF dual-hosted git repository. rohit pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit 5f04018bf099ff8973f31c1bec9e79ae08a0ce71 Merge: 61e4e862c4 5aec43949e Author: Rohit Yadav <[email protected]> AuthorDate: Wed Jul 27 12:41:31 2022 +0200 Merge remote-tracking branch 'origin/4.17' .../com/cloud/agent/api/storage/OVFHelper.java | 27 ++++++----- .../com/cloud/agent/api/storage/OVFParser.java | 20 ++++---- .../kvm/resource/LibvirtComputingResource.java | 12 ++--- .../kvm/resource/LibvirtDomainXMLParser.java | 7 +-- .../kvm/resource/LibvirtStoragePoolXMLParser.java | 4 +- .../resource/LibvirtStorageVolumeXMLParser.java | 4 +- .../hypervisor/kvm/resource/LibvirtXMLParser.java | 4 +- .../wrapper/LibvirtMigrateCommandWrapper.java | 15 +++--- .../xenserver/resource/CitrixResourceBase.java | 6 +-- .../network/cisco/CiscoVnmcConnectionImpl.java | 5 +- .../cloud/network/resource/JuniperSrxResource.java | 6 +-- .../cloud/network/resource/PaloAltoResource.java | 12 ++--- .../api/command/GetServiceProviderMetaDataCmd.java | 47 +++++++++--------- .../java/com/cloud/api/query/QueryManagerImpl.java | 3 ++ .../main/java/com/cloud/test/DatabaseConfig.java | 54 +++++++++++---------- .../main/java/com/cloud/vm/UserVmManagerImpl.java | 4 +- utils/src/main/java/com/cloud/utils/UriUtils.java | 10 ++-- .../cloud/utils/cisco/n1kv/vsm/VsmResponse.java | 5 +- .../com/cloud/utils/xmlobject/XmlObjectParser.java | 4 +- .../cloudstack/utils/security/ParserUtils.java | 31 ++++++++++++ .../cloudstack/utils/security/ParserUtilsTest.java | 55 ++++++++++++++++++++++ .../hypervisor/vmware/mo/HypervisorHostHelper.java | 5 +- 22 files changed, 219 insertions(+), 121 deletions(-)
