[2/2] git commit: refs/heads/master - NiciraNvpElement is loaded twice, but no idea where. This makes it work however

[hu...@apache.org]

Updated Branches:
  refs/heads/master 6b3da5fbd -> 43dc31bcf


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/master
Commit: 43dc31bcf2cf985bd7f49b4dbc6814627cb3eb1d
Parents: f8a22d7
Author: Hugo Trippaers <ht...@schubergphilis.com>
Authored: Mon Feb 4 15:07:55 2013 +0100
Committer: Hugo Trippaers <ht...@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">