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 a706bf2380e11590ef5a268550b63e89e57b5a8f
Merge: 2132f46fcb3 594c70dde0e
Author: Daan Hoogland <[email protected]>
AuthorDate: Fri Jul 7 11:49:35 2023 +0200

    Merge branch '4.18'

 .../org/apache/cloudstack/direct/download/DirectDownloadHelper.java     | 2 +-
 .../org/apache/cloudstack/direct/download/DirectTemplateDownloader.java | 2 +-
 .../cloudstack/direct/download/HttpsDirectTemplateDownloader.java       | 2 +-
 .../org/apache/cloudstack/direct/download/HttpsMultiTrustManager.java   | 2 +-
 .../cloudstack/direct/download/MetalinkDirectTemplateDownloader.java    | 2 +-
 core/src/test/java/com/cloud/storage/JavaStorageLayerTest.java          | 1 -
 .../cloudstack/direct/download/BaseDirectTemplateDownloaderTest.java    | 2 +-
 .../cloudstack/direct/download/HttpsDirectTemplateDownloaderTest.java   | 2 +-
 .../direct/download/MetalinkDirectTemplateDownloaderTest.java           | 2 +-
 plugins/storage/volume/storpool/README.md                               | 1 -
 10 files changed, 8 insertions(+), 10 deletions(-)

Reply via email to