(cloudstack) branch 4.22 updated: merge forwards fix

[dahn]

This is an automated email from the ASF dual-hosted git repository.

dahn pushed a commit to branch 4.22
in repository https://gitbox.apache.org/repos/asf/cloudstack.git


The following commit(s) were added to refs/heads/4.22 by this push:
     new f5e75771bcb merge forwards fix
f5e75771bcb is described below

commit f5e75771bcbb7321f137ad4a08c77d38461f3f9b
Author: Daan Hoogland <d...@apache.org>
AuthorDate: Wed Apr 15 09:58:21 2026 +0200

    merge forwards fix
---
 .../src/test/java/org/apache/cloudstack/backup/BackupManagerTest.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/server/src/test/java/org/apache/cloudstack/backup/BackupManagerTest.java 
b/server/src/test/java/org/apache/cloudstack/backup/BackupManagerTest.java
index a65e2f2ed39..db75602b600 100644
--- a/server/src/test/java/org/apache/cloudstack/backup/BackupManagerTest.java
+++ b/server/src/test/java/org/apache/cloudstack/backup/BackupManagerTest.java
@@ -1585,7 +1585,7 @@ public class BackupManagerTest {
     }
 
     @Test(expected = CloudRuntimeException.class)
-    public void testDeleteBackupBlockedByPendingJobs() {
+    public void testDeleteBackupBlockedByPendingJobs() throws 
ResourceAllocationException {
         Long backupId = 1L;
         Long vmId = 2L;