Merge branch 'Backroll' into Backroll-dev

core/src/main/resources/META-INF/cloudstack/bootstrap/default-config-resources.xml

@@ -1,3 +1,23 @@
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:schemaLocation="http://www.springframework.org/schema/beans

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

@@ -118,7 +118,7 @@ public class BackrollBackupProvider extends AdapterBase implements BackupProvide
                 return results;
             }
         } catch (ParseException | BackrollApiException | IOException e) {
-            logger.info("BackrollProvider: catch erreur: " + e);
+            logger.info("BackrollProvider: catch erreur: {}", e);
             throw new CloudRuntimeException("Failed to load backup offerings");
         }
         return new ArrayList<BackupOffering>();

plugins/backup/backroll/src/main/java/org/apache/cloudstack/backup/backroll/BackrollClient.java

@@ -232,4 +232,4 @@ public class BackrollClient {
 
         return backups;
     }
-}
+}

plugins/backup/backroll/src/main/java/org/apache/cloudstack/backup/backroll/model/response/archive/BackrollBackupsFromVMResponse.java

@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 package org.apache.cloudstack.backup.backroll.model.response.archive;
 
 import org.apache.cloudstack.backup.backroll.model.response.BackrollAsyncResponse;
@@ -7,4 +23,4 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 public class BackrollBackupsFromVMResponse extends BackrollAsyncResponse {
     @JsonProperty("info")
     public BackrollArchivesResponse archives;
-}
+}

plugins/backup/backroll/src/main/java/org/apache/cloudstack/backup/backroll/model/response/backup/BackrollBackupResponse.java

@@ -20,4 +20,4 @@ import org.apache.cloudstack.backup.backroll.model.response.BackrollAsyncRespons
 
 public class BackrollBackupResponse extends BackrollAsyncResponse{
 
-}
+}