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 8A6E510BF5 for ; Tue, 18 Mar 2014 06:02:13 +0000 (UTC) Received: (qmail 37778 invoked by uid 500); 18 Mar 2014 06:02:13 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 37757 invoked by uid 500); 18 Mar 2014 06:02:12 -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 37747 invoked by uid 99); 18 Mar 2014 06:02:12 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 18 Mar 2014 06:02:12 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 21FF494688A; Tue, 18 Mar 2014 06:02:12 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: mlsorensen@apache.org To: commits@cloudstack.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: git commit: updated refs/heads/4.4 to 5fe568d Date: Tue, 18 Mar 2014 06:02:12 +0000 (UTC) Repository: cloudstack Updated Branches: refs/heads/4.4 4901cc535 -> 5fe568d5c now fix MY root resize test, which passes 0 in one test... Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/5fe568d5 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/5fe568d5 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/5fe568d5 Branch: refs/heads/4.4 Commit: 5fe568d5cf435484945d58c8da17f0f815f123f8 Parents: 4901cc5 Author: Marcus Sorensen Authored: Fri Mar 14 07:40:12 2014 -0600 Committer: Marcus Sorensen Committed: Fri Mar 14 07:40:56 2014 -0600 ---------------------------------------------------------------------- tools/marvin/marvin/integration/lib/base.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5fe568d5/tools/marvin/marvin/integration/lib/base.py ---------------------------------------------------------------------- diff --git a/tools/marvin/marvin/integration/lib/base.py b/tools/marvin/marvin/integration/lib/base.py index 38e8568..775b289 100755 --- a/tools/marvin/marvin/integration/lib/base.py +++ b/tools/marvin/marvin/integration/lib/base.py @@ -424,7 +424,7 @@ class VirtualMachine: if custommemory: cmd.details[0]["memory"] = custommemory - if rootdisksize: + if rootdisksize >= 0: cmd.details[0]["rootdisksize"] = rootdisksize if group: