etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'Backroll' into Backroll-dev

This commit is contained in:
Pierre Charton 2024-12-16 17:02:11 +01:00
parent ab25490807 4b05c8c523
commit eb400da8ad
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/backup/backroll/src/main/java/org/apache/cloudstack/backup/BackrollBackupProvider.java
View File

@ -410,7 +410,7 @@ public class BackrollBackupProvider extends AdapterBase implements BackupProvide
logger.debug("Backroll Provider GetClient with zone id {}", zoneId);
try {
if (backrollClient == null) {
logger.debug("backroll client null - instanciation of new one ");
logger.debug("backroll client null - instantiation of new one ");
BackrollHttpClientProvider provider = new BackrollHttpClientProvider(BackrollUrlConfigKey.valueIn(zoneId), BackrollAppNameConfigKey.valueIn(zoneId), BackrollPasswordConfigKey.valueIn(zoneId), true, 300, 600);
backrollClient = new BackrollClient(provider);
}

2
plugins/backup/backroll/src/main/java/org/apache/cloudstack/backup/backroll/model/BackrollVmBackup.java
View File

@ -40,4 +40,4 @@ public class BackrollVmBackup {
this.name = name;
this.date = date;
}
}
}

2
plugins/backup/backroll/src/main/java/org/apache/cloudstack/backup/backroll/model/response/backup/BackrollBackupStatusResponse.java
View File

@ -30,4 +30,4 @@ public class BackrollBackupStatusResponse {
@JsonProperty("status")
public String status;
}
}