This is an automated email from the ASF dual-hosted git repository. shwstppr pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit 6ea5f56e626a4dbb02bef0a52bc570899a05ac11 Merge: 841fd725601 b030ea19a47 Author: Abhishek Kumar <[email protected]> AuthorDate: Tue Jun 6 13:12:55 2023 +0530 Merge remote-tracking branch 'apache/4.18' into main .../storage/resource/VmwareStorageProcessor.java | 5 +- .../java/com/cloud/storage/StorageManagerImpl.java | 30 +- .../com/cloud/storage/StorageManagerImplTest.java | 72 +- test/integration/smoke/test_vpc_vpn.py | 297 ++------ tools/build/setnextversion.sh | 1 - tools/marvin/marvin/config/test_data.py | 823 +++++++++++++-------- 6 files changed, 670 insertions(+), 558 deletions(-)
