Merge branch '4.18'

core/src/main/java/org/apache/cloudstack/direct/download/DirectDownloadHelper.java

@@ -80,4 +80,4 @@ public class DirectDownloadHelper {
         DirectTemplateDownloader checker = getCheckerDownloader(url);
         return checker.getRemoteFileSize(url, format);
     }
-}
+}

core/src/main/java/org/apache/cloudstack/direct/download/DirectTemplateDownloader.java

@@ -58,4 +58,4 @@ public interface DirectTemplateDownloader {
      * Get the list of checksums within a metalink content
      */
     List<String> getMetalinkChecksums(String metalinkUrl);
-}
+}

core/src/main/java/org/apache/cloudstack/direct/download/HttpsDirectTemplateDownloader.java

@@ -249,4 +249,4 @@ public class HttpsDirectTemplateDownloader extends DirectTemplateDownloaderImpl
         }
         return null;
     }
-}
+}

core/src/main/java/org/apache/cloudstack/direct/download/HttpsMultiTrustManager.java

@@ -99,4 +99,4 @@ public class HttpsMultiTrustManager implements X509TrustManager {
         }
         return null;
     }
-}
+}

core/src/main/java/org/apache/cloudstack/direct/download/MetalinkDirectTemplateDownloader.java

@@ -174,4 +174,4 @@ public class MetalinkDirectTemplateDownloader extends DirectTemplateDownloaderIm
         return downloader.getMetalinkChecksums(metalinkUrl);
     }
 
-}
+}

core/src/test/java/com/cloud/storage/JavaStorageLayerTest.java

@@ -43,4 +43,3 @@ public class JavaStorageLayerTest {
         }
     }
 }
-

core/src/test/java/org/apache/cloudstack/direct/download/BaseDirectTemplateDownloaderTest.java

@@ -69,4 +69,4 @@ public class BaseDirectTemplateDownloaderTest {
         ByteArrayInputStream inputStream = new ByteArrayInputStream(httpMetalinkContent.getBytes(StandardCharsets.UTF_8));
         Mockito.when(httpEntity.getContent()).thenReturn(inputStream);
     }
-}
+}

core/src/test/java/org/apache/cloudstack/direct/download/HttpsDirectTemplateDownloaderTest.java

@@ -33,4 +33,4 @@ public class HttpsDirectTemplateDownloaderTest extends BaseDirectTemplateDownloa
         Assert.assertEquals(1, metalinkUrls.size());
         Assert.assertEquals(httpMetalinkUrl, metalinkUrls.get(0));
     }
-}
+}

core/src/test/java/org/apache/cloudstack/direct/download/MetalinkDirectTemplateDownloaderTest.java

@@ -32,4 +32,4 @@ public class MetalinkDirectTemplateDownloaderTest extends BaseDirectTemplateDown
         boolean result = metalinkDownloader.checkUrl(httpsUrl);
         Assert.assertTrue(result);
     }
-}
+}

plugins/storage/volume/storpool/README.md

@@ -350,4 +350,3 @@ Supported Virtual machine operations - live migration of VM to another host, vir
 Supported Volume operations - attach/detach volume, live migrate volume between two StorPool primary storages, volume snapshot, delete snapshot, revert snapshot
 
 Note: volume snapshot are allowed only when `sp.bypass.secondary.storage` is set to `true`. This means that the snapshots are not backed up to secondary storage
-