cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From h...@apache.org
Subject git commit: updated refs/heads/master to eacc0d7
Date Fri, 05 Apr 2013 07:06:28 GMT
Updated Branches:
  refs/heads/master 1274d8f68 -> eacc0d7a8


CLOUDSTACK-1917: Both MidoNet and NiciraNvp have a network guru that must be loaded


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

Branch: refs/heads/master
Commit: eacc0d7a89ea678d1f5d03c6f4e278b680fd9457
Parents: 1274d8f
Author: Hugo Trippaers <trippie@gmail.com>
Authored: Fri Apr 5 08:46:39 2013 +0200
Committer: Hugo Trippaers <trippie@gmail.com>
Committed: Fri Apr 5 08:46:39 2013 +0200

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


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/eacc0d7a/client/tomcatconf/componentContext.xml.in
----------------------------------------------------------------------
diff --git a/client/tomcatconf/componentContext.xml.in b/client/tomcatconf/componentContext.xml.in
index a006708..bea2f78 100644
--- a/client/tomcatconf/componentContext.xml.in
+++ b/client/tomcatconf/componentContext.xml.in
@@ -225,6 +225,8 @@
           <ref bean="DirectNetworkGuru"/>
           <ref bean="OvsGuestNetworkGuru"/>
           <ref bean="PrivateNetworkGuru"/>
+          <ref bean="NiciraNvpGuestNetworkGuru"/>
+          <ref bean="MidoNetGuestNetworkGuru"/>
       </list>
     </property>
   </bean>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/eacc0d7a/client/tomcatconf/nonossComponentContext.xml.in
----------------------------------------------------------------------
diff --git a/client/tomcatconf/nonossComponentContext.xml.in b/client/tomcatconf/nonossComponentContext.xml.in
index 5aec888..187446c 100644
--- a/client/tomcatconf/nonossComponentContext.xml.in
+++ b/client/tomcatconf/nonossComponentContext.xml.in
@@ -306,6 +306,8 @@
           <ref bean="DirectNetworkGuru"/>
           <ref bean="OvsGuestNetworkGuru"/>
           <ref bean="PrivateNetworkGuru"/>
+          <ref bean="NiciraNvpGuestNetworkGuru"/>
+          <ref bean="MidoNetGuestNetworkGuru"/>
       </list>
     </property>
   </bean>


Mime
View raw message