You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by jb...@apache.org on 2013/07/31 15:57:57 UTC
git commit: updated refs/heads/4.2 to 3cf09f3
Updated Branches:
refs/heads/4.2 79af8b16b -> 3cf09f337
- 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/3cf09f33
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/3cf09f33
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/3cf09f33
Branch: refs/heads/4.2
Commit: 3cf09f337f0717b327013186e9775d8a858ed8df
Parents: 79af8b1
Author: John Burwell <jb...@apache.org>
Authored: Wed Jul 31 09:57:07 2013 -0400
Committer: John Burwell <jb...@apache.org>
Committed: Wed Jul 31 09:57:07 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/3cf09f33/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 80bdf42..1bf94bd 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
@@ -7500,7 +7500,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/3cf09f33/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()]));