From: Jenkins <jenkins@review.openstack.org>
Date: Tue, 11 Feb 2014 06:57:01 +0000 (+0000)
Subject: Merge "Prepare for multiple cisco ML2 mech drivers"
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=7c7d04df05568575ec35ea00d73c1dd8ad5a3c59;p=openstack-build%2Fneutron-build.git

Merge "Prepare for multiple cisco ML2 mech drivers"
---

7c7d04df05568575ec35ea00d73c1dd8ad5a3c59
diff --cc setup.cfg
index df29454d1,31804c37b..8c83cfa14
--- a/setup.cfg
+++ b/setup.cfg
@@@ -157,9 -156,8 +157,9 @@@ neutron.ml2.mechanism_drivers 
      hyperv = neutron.plugins.ml2.drivers.mech_hyperv:HypervMechanismDriver
      ncs = neutron.plugins.ml2.drivers.mechanism_ncs:NCSMechanismDriver
      arista = neutron.plugins.ml2.drivers.mech_arista.mechanism_arista:AristaDriver
-     cisco_nexus = neutron.plugins.ml2.drivers.cisco.mech_cisco_nexus:CiscoNexusMechanismDriver
+     cisco_nexus = neutron.plugins.ml2.drivers.cisco.nexus.mech_cisco_nexus:CiscoNexusMechanismDriver
      l2population = neutron.plugins.ml2.drivers.l2pop.mech_driver:L2populationMechanismDriver
 +    bigswitch = neutron.plugins.ml2.drivers.mech_bigswitch.driver:BigSwitchMechanismDriver
  
  [build_sphinx]
  all_files = 1