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 45EA71090C for ; Sun, 30 Jun 2013 08:30:00 +0000 (UTC) Received: (qmail 41939 invoked by uid 500); 30 Jun 2013 08:29:59 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 41894 invoked by uid 500); 30 Jun 2013 08:29:59 -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 41887 invoked by uid 99); 30 Jun 2013 08:29:58 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 30 Jun 2013 08:29:58 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 58B363CC79; Sun, 30 Jun 2013 08:29:57 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: tsp@apache.org To: commits@cloudstack.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: git commit: updated refs/heads/master-6-17-stable to ffb1b02 Date: Sun, 30 Jun 2013 08:29:57 +0000 (UTC) Updated Branches: refs/heads/master-6-17-stable 9c4155e03 -> ffb1b02a4 pep8 fix Signed-off-by: Prasanna Santhanam (cherry picked from commit 3684bafd37db5884dbd3594b8f1408848fcdffb8) Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/ffb1b02a Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ffb1b02a Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ffb1b02a Branch: refs/heads/master-6-17-stable Commit: ffb1b02a476ee6ec8584a3e13b1230fdfe181e7d Parents: 9c4155e Author: Prasanna Santhanam Authored: Sun Jun 30 13:58:16 2013 +0530 Committer: Prasanna Santhanam Committed: Sun Jun 30 13:59:41 2013 +0530 ---------------------------------------------------------------------- tools/marvin/marvin/deployDataCenter.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ffb1b02a/tools/marvin/marvin/deployDataCenter.py ---------------------------------------------------------------------- diff --git a/tools/marvin/marvin/deployDataCenter.py b/tools/marvin/marvin/deployDataCenter.py index f00b486..a15f48f 100644 --- a/tools/marvin/marvin/deployDataCenter.py +++ b/tools/marvin/marvin/deployDataCenter.py @@ -118,7 +118,8 @@ class deployDataCenters(): self.createVlanIpRanges("Basic", pod.guestIpRanges, zoneId,\ podId, networkId) - self.createClusters(pod.clusters, zoneId, podId, vmwareDc=pod.vmwaredc) + self.createClusters(pod.clusters, zoneId, podId, + vmwareDc=pod.vmwaredc) def createVlanIpRanges(self, mode, ipranges, zoneId, podId=None,\ networkId=None, forvirtualnetwork=None):