cloudstack-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Daan Hoogland <daan.hoogl...@gmail.com>
Subject Re: [acs441][acs450] hotfix merge request
Date Tue, 19 Aug 2014 14:37:01 GMT
Pierre-Luc,

What is this supposed to do? I see no change in the logic in your commit:

commit 62d9843e0ce9e9c2418258697e583dd9de4a68d0
Author: Pierre-Luc Dion <pdion891@apache.org>
Date:   Thu Aug 14 13:07:32 2014 -0400

    NfsSecondaryStorageResource.java:remove empty spaces

diff --git
a/services/secondary-storage/server/src/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java
b/services/secondary-storage/server/src/org/
index f095403..f9a06f1 100755
---
a/services/secondary-storage/server/src/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java
+++
b/services/secondary-storage/server/src/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java
@@ -329,7 +329,7 @@ public class NfsSecondaryStorageResource extends
ServerResourceBase implements S
                     s_logger.error(errMsg);
                     return new CopyCmdAnswer(errMsg);
                 }
-            }
+            }

             File destFile = SwiftUtil.getObject(swiftTO,
downloadDirectory, srcData.getPath());
             return postProcessing(destFile, downloadPath, destPath,
srcData, destData);


On Sat, Aug 16, 2014 at 4:55 PM, Pierre-Luc Dion <pdion@cloudops.com> wrote:

> Hi,
>
> Please merge hotfix/4.4-7343  into 4.4 branch.  master branch is also
> affected so potentially 4.5 so can this be merge into those branch as well
> ?
>
> https://issues.apache.org/jira/browse/CLOUDSTACK-7343
>
>
> It as been tested with 4.4.1 and seams to resolve unworkable swift as
> secondary storage. This fix is a cut and past from S3 same behavior [1].
>
>
>
> Thanks !
>
> [1]
>
> https://git-wip-us.apache.org/repos/asf?p=cloudstack.git;a=blobdiff;f=services/secondary-storage/server/src/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java;h=78f4bf19a9192f1df581c1c0ddb90f2491a93cc9;hp=6927f028cf23db81c86c8e5d0059e3a3c3f37a81;hb=6b8b7b82f41c415f1e0d1ed715e14f3664e39e22;hpb=f7dd1720cb6217d4425e9a92268f6b716e88a18c
>
>
>
> *Pierre-Luc DION*
> Architecte de Solution Cloud | Cloud Solutions Architect
> t 855.652.5683
>
> *CloudOps* Votre partenaire infonuagique* | *Cloud Solutions Experts
> 420 rue Guy *|* Montreal *|* Quebec *|* H3J 1S6
> w cloudops.com *|* tw @CloudOps_
>



-- 
Daan

Mime
  • Unnamed multipart/alternative (inline, None, 0 bytes)
View raw message