cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jburw...@apache.org
Subject git commit: updated refs/heads/master to ceed152
Date Wed, 31 Jul 2013 13:58:33 GMT
Updated Branches:
  refs/heads/master 980b22781 -> ceed15242


- CLOUDSTACK-3229: Passes the bucket name as "bucket" into the s3xen
  plugin


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/ceed1524
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ceed1524
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ceed1524

Branch: refs/heads/master
Commit: ceed152426560946a42e042864635b00f0d17e52
Parents: 980b227
Author: John Burwell <jburwell@apache.org>
Authored: Wed Jul 31 09:57:07 2013 -0400
Committer: John Burwell <jburwell@apache.org>
Committed: Wed Jul 31 09:58:22 2013 -0400

----------------------------------------------------------------------
 .../src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java  | 2 +-
 .../cloud/hypervisor/xen/resource/XenServerStorageProcessor.java   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ceed1524/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
index 49d9a5c..735eeda 100644
--- a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
+++ b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
@@ -7388,7 +7388,7 @@ public abstract class CitrixResourceBase implements ServerResource,
HypervisorRe
                     serializeProperties(s3, S3Utils.ClientOptions.class));
             parameters.addAll(Arrays.asList("operation", "put", "directory",
                     dir, "filename", filename, "iSCSIFlag",
-                    iSCSIFlag.toString(), "key", key));
+                    iSCSIFlag.toString(), "bucket", s3.getBucketName(), "key", key));
             final String result = callHostPluginAsync(connection, "s3xen",
                     "s3", wait,
                     parameters.toArray(new String[parameters.size()]));

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ceed1524/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServerStorageProcessor.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServerStorageProcessor.java
b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServerStorageProcessor.java
index 69149ec..c02c3b0 100644
--- a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServerStorageProcessor.java
+++ b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServerStorageProcessor.java
@@ -1129,7 +1129,7 @@ public class XenServerStorageProcessor implements StorageProcessor {
                     serializeProperties(s3, S3Utils.ClientOptions.class));
             parameters.addAll(Arrays.asList("operation", "put", "directory",
                     dir, "filename", filename, "iSCSIFlag",
-                    iSCSIFlag.toString(), "key", key));
+                    iSCSIFlag.toString(), "bucket", s3.getBucketName(), "key", key));
             final String result = hypervisorResource.callHostPluginAsync(connection, "s3xen",
                     "s3", wait,
                     parameters.toArray(new String[parameters.size()]));


Mime
View raw message