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 7F464D734 for ; Wed, 15 May 2013 00:53:29 +0000 (UTC) Received: (qmail 18625 invoked by uid 500); 15 May 2013 00:53:29 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 18607 invoked by uid 500); 15 May 2013 00:53:29 -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 18595 invoked by uid 99); 15 May 2013 00:53:29 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 15 May 2013 00:53:29 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 0AFBEA370; Wed, 15 May 2013 00:53:29 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: anthonyxu@apache.org To: commits@cloudstack.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: git commit: updated refs/heads/master to 1518e7e Date: Wed, 15 May 2013 00:53:29 +0000 (UTC) Updated Branches: refs/heads/master 26cefdcfa -> 1518e7ee4 CLOUDSTACK-2115: remove the trailing '\n' to get correct XS network mode Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/1518e7ee Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/1518e7ee Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/1518e7ee Branch: refs/heads/master Commit: 1518e7ee43f091fc528cb7b70e5dcfdf7c623e22 Parents: 26cefdc Author: Anthony Xu Authored: Tue May 14 17:52:10 2013 -0700 Committer: Anthony Xu Committed: Tue May 14 17:52:10 2013 -0700 ---------------------------------------------------------------------- scripts/vm/hypervisor/xenserver/vmops | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1518e7ee/scripts/vm/hypervisor/xenserver/vmops ---------------------------------------------------------------------- diff --git a/scripts/vm/hypervisor/xenserver/vmops b/scripts/vm/hypervisor/xenserver/vmops index 66cde4f..60fb8ab 100755 --- a/scripts/vm/hypervisor/xenserver/vmops +++ b/scripts/vm/hypervisor/xenserver/vmops @@ -279,7 +279,7 @@ def setLinkLocalIP(session, args): except: return 'can not cat network.conf' - if result.lower() == "bridge": + if result.lower().strip() == "bridge": try: cmd = ["brctl", "addbr", brName] txt = util.pread2(cmd)