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 76C8A11881 for ; Mon, 13 May 2013 21:50:24 +0000 (UTC) Received: (qmail 72650 invoked by uid 500); 13 May 2013 21:50:24 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 72597 invoked by uid 500); 13 May 2013 21:50:24 -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 72590 invoked by uid 99); 13 May 2013 21:50:24 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 13 May 2013 21:50:24 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 0494977B4; Mon, 13 May 2013 21:50:24 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: edison@apache.org To: commits@cloudstack.apache.org Message-Id: <95e8fe2f68c84bf29b297783bcfec271@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: updated refs/heads/object_store to 1694c1a Date: Mon, 13 May 2013 21:50:24 +0000 (UTC) Updated Branches: refs/heads/object_store e6faa47a4 -> 1694c1a50 fix download timeout Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/1694c1a5 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/1694c1a5 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/1694c1a5 Branch: refs/heads/object_store Commit: 1694c1a502c5dbf43da761648c203495bd5a2dcd Parents: e6faa47 Author: Edison Su Authored: Mon May 13 14:40:21 2013 -0700 Committer: Edison Su Committed: Mon May 13 14:40:49 2013 -0700 ---------------------------------------------------------------------- .../cloudstack/storage/RemoteHostEndPoint.java | 2 +- tools/marvin/marvin/deployDataCenter.py | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1694c1a5/engine/storage/src/org/apache/cloudstack/storage/RemoteHostEndPoint.java ---------------------------------------------------------------------- diff --git a/engine/storage/src/org/apache/cloudstack/storage/RemoteHostEndPoint.java b/engine/storage/src/org/apache/cloudstack/storage/RemoteHostEndPoint.java index 7a651c0..0e88b65 100644 --- a/engine/storage/src/org/apache/cloudstack/storage/RemoteHostEndPoint.java +++ b/engine/storage/src/org/apache/cloudstack/storage/RemoteHostEndPoint.java @@ -146,7 +146,7 @@ public class RemoteHostEndPoint implements EndPoint { @Override public int getTimeout() { // TODO Auto-generated method stub - return 0; + return -1; } @Override http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1694c1a5/tools/marvin/marvin/deployDataCenter.py ---------------------------------------------------------------------- diff --git a/tools/marvin/marvin/deployDataCenter.py b/tools/marvin/marvin/deployDataCenter.py index dd6db05..b6d41ff 100644 --- a/tools/marvin/marvin/deployDataCenter.py +++ b/tools/marvin/marvin/deployDataCenter.py @@ -142,8 +142,10 @@ class deployDataCenters(): secondarycmd.url = secondary.url secondarycmd.provider = secondary.providerName secondarycmd.details = [] - for item in secondary.details: - secondarycmd.details.append(item.__dict__) + + if isinstance(secondary.details, list): + for item in secondary.details: + secondarycmd.details.append(item.__dict__) if secondarycmd.provider == "NFS": secondarycmd.zoneid = zoneId self.apiClient.addImageStore(secondarycmd)