Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id C8D8EF99E for ; Thu, 13 Nov 2014 09:42:51 +0000 (UTC) Received: (qmail 3218 invoked by uid 500); 13 Nov 2014 09:42:47 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 3133 invoked by uid 500); 13 Nov 2014 09:42:47 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 2552 invoked by uid 99); 13 Nov 2014 09:42:46 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 13 Nov 2014 09:42:46 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id B3CABA13915; Thu, 13 Nov 2014 09:42:46 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: rajani@apache.org To: commits@cloudstack.apache.org Date: Thu, 13 Nov 2014 09:43:10 -0000 Message-Id: In-Reply-To: <76999f67ce664ec6ae94b2aefe4f51eb@git.apache.org> References: <76999f67ce664ec6ae94b2aefe4f51eb@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [25/28] git commit: updated refs/heads/master to 8c9093b CLOUDSTACK-7887: change int to str into swiftxen Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/6c955a3a Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/6c955a3a Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/6c955a3a Branch: refs/heads/master Commit: 6c955a3a472da1308a5336a48b29514b78c543e4 Parents: a4b92e9 Author: Pierre-Luc Dion Authored: Wed Nov 12 19:18:37 2014 -0500 Committer: Pierre-Luc Dion Committed: Wed Nov 12 19:22:13 2014 -0500 ---------------------------------------------------------------------- scripts/vm/hypervisor/xenserver/swiftxen | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6c955a3a/scripts/vm/hypervisor/xenserver/swiftxen ---------------------------------------------------------------------- diff --git a/scripts/vm/hypervisor/xenserver/swiftxen b/scripts/vm/hypervisor/xenserver/swiftxen index 8342238..f56d5ad 100644 --- a/scripts/vm/hypervisor/xenserver/swiftxen +++ b/scripts/vm/hypervisor/xenserver/swiftxen @@ -69,7 +69,7 @@ def upload(args): if size > MAX_SEG_SIZE : segment = 1 if segment : - cmd = [SWIFT, "-A", url, "-U", account + ":" + username, "-K", key, "upload", "-S", MAX_SEG_SIZE, container, lfilename] + cmd = [SWIFT, "-A", url, "-U", account + ":" + username, "-K", key, "upload", "-S", str(MAX_SEG_SIZE), container, lfilename] else : cmd = [SWIFT, "-A", url ,"-U", account + ":" + username, "-K", key, "upload", container, lfilename] util.pread2(cmd)