From: Sumit Naiksatam <snaiksat@cisco.com>
Date: Sun, 24 Jul 2011 17:00:33 +0000 (-0700)
Subject: Merge changes from lp:quantum
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=87978cc2bf1db993190fc7339c0ff4e5a1139228;p=openstack-build%2Fneutron-build.git

Merge changes from lp:quantum
---

87978cc2bf1db993190fc7339c0ff4e5a1139228
diff --cc quantum/plugins.ini
index 60db782d0,448cab59e..5192ade26
--- a/quantum/plugins.ini
+++ b/quantum/plugins.ini
@@@ -1,3 -1,4 +1,4 @@@
  [PLUGIN]
  # Quantum plugin provider module
 +provider = quantum.plugins.cisco.l2network_plugin.L2Network
+ #provider = quantum.plugins.SamplePlugin.FakePlugin
 -provider = quantum.plugins.openvswitch.ovs_quantum_plugin.OVSQuantumPlugin