Return-Path: 
 <cloudstack-commits-return-10525-apmail-incubator-cloudstack-commits-archive=incubator.apache.org@incubator.apache.org>
X-Original-To: apmail-incubator-cloudstack-commits-archive@minotaur.apache.org
Delivered-To: apmail-incubator-cloudstack-commits-archive@minotaur.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id A8EDAE660
	for <apmail-incubator-cloudstack-commits-archive@minotaur.apache.org>;
 Wed,  6 Feb 2013 02:43:40 +0000 (UTC)
Received: (qmail 41576 invoked by uid 500); 6 Feb 2013 02:43:33 -0000
Delivered-To: apmail-incubator-cloudstack-commits-archive@incubator.apache.org
Received: (qmail 41126 invoked by uid 500); 6 Feb 2013 02:43:32 -0000
Mailing-List: contact cloudstack-commits-help@incubator.apache.org;
 run by ezmlm
Precedence: bulk
List-Help: <mailto:cloudstack-commits-help@incubator.apache.org>
List-Unsubscribe: <mailto:cloudstack-commits-unsubscribe@incubator.apache.org>
List-Post: <mailto:cloudstack-commits@incubator.apache.org>
List-Id: <cloudstack-commits.incubator.apache.org>
Reply-To: cloudstack-dev@incubator.apache.org
Delivered-To: mailing list cloudstack-commits@incubator.apache.org
Received: (qmail 38798 invoked by uid 99); 6 Feb 2013 02:43: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, 06 Feb 2013 02:43:29 +0000
Received: by tyr.zones.apache.org (Postfix, from userid 65534)
	id BA9CA82AC2D; Wed,  6 Feb 2013 02:43:29 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: edison@apache.org
To: cloudstack-commits@incubator.apache.org
X-Mailer: ASF-Git Admin Mailer
Subject: [1/50] [abbrv] git commit: refs/heads/storage_refactor -
 NiciraNvpElement is loaded twice,
 but no idea where. This makes it work however
Message-Id: <20130206024329.BA9CA82AC2D@tyr.zones.apache.org>
Date: Wed,  6 Feb 2013 02:43:29 +0000 (UTC)

NiciraNvpElement is loaded twice, but no idea where. This makes it work
however

Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/43dc31bc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/43dc31bc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/43dc31bc

Branch: refs/heads/storage_refactor
Commit: 43dc31bcf2cf985bd7f49b4dbc6814627cb3eb1d
Parents: f8a22d7
Author: Hugo Trippaers <htrippaers@schubergphilis.com>
Authored: Mon Feb 4 15:07:55 2013 +0100
Committer: Hugo Trippaers <htrippaers@schubergphilis.com>
Committed: Mon Feb 4 15:08:58 2013 +0100

----------------------------------------------------------------------
 client/tomcatconf/componentContext.xml.in |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/43dc31bc/client/tomcatconf/componentContext.xml.in
----------------------------------------------------------------------
diff --git a/client/tomcatconf/componentContext.xml.in b/client/tomcatconf/componentContext.xml.in
index e3bf982..d2e3ede 100644
--- a/client/tomcatconf/componentContext.xml.in
+++ b/client/tomcatconf/componentContext.xml.in
@@ -77,9 +77,11 @@
   <bean id="VpcVirtualRouter" class="com.cloud.network.element.VpcVirtualRouterElement">
     <property name="name" value="VpcVirtualRouter"/>
   </bean>
+  <!--
   <bean id="NiciraNvp" class="com.cloud.network.element.NiciraNvpElement">
     <property name="name" value="NiciraNvp"/>
   </bean>
+  -->
   
 <!--
   <bean id="BigSwitchVnsElementService" class="com.cloud.network.element.BigSwitchVnsElement">