From: Jenkins <jenkins@review.openstack.org>
Date: Sat, 3 Oct 2015 00:55:14 +0000 (+0000)
Subject: Merge "Decomposition phase2 for MidoNet plugin"
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=51b8b19ef29cafe239e61061ad04bcf4959d9015;p=openstack-build%2Fneutron-build.git

Merge "Decomposition phase2 for MidoNet plugin"
---

51b8b19ef29cafe239e61061ad04bcf4959d9015
diff --cc setup.cfg
index dbc828717,b0a47339e..f4222c8bc
--- a/setup.cfg
+++ b/setup.cfg
@@@ -51,9 -51,11 +51,8 @@@ data_files 
          etc/neutron/plugins/brocade/brocade_mlx.ini
      etc/neutron/plugins/brocade/vyatta = etc/neutron/plugins/brocade/vyatta/vrouter.ini
      etc/neutron/plugins/cisco =
 -        etc/neutron/plugins/cisco/cisco_cfg_agent.ini
 -        etc/neutron/plugins/cisco/cisco_plugins.ini
 -        etc/neutron/plugins/cisco/cisco_router_plugin.ini
          etc/neutron/plugins/cisco/cisco_vpn_agent.ini
      etc/neutron/plugins/embrane = etc/neutron/plugins/embrane/heleos_conf.ini
-     etc/neutron/plugins/midonet = etc/neutron/plugins/midonet/midonet.ini
      etc/neutron/plugins/ml2 =
          etc/neutron/plugins/bigswitch/restproxy.ini
          etc/neutron/plugins/ml2/linuxbridge_agent.ini
@@@ -104,8 -104,8 +103,7 @@@ console_scripts 
  neutron.core_plugins =
      bigswitch = neutron.plugins.bigswitch.plugin:NeutronRestProxyV2
      brocade = neutron.plugins.brocade.NeutronPlugin:BrocadePluginV2
 -    cisco = neutron.plugins.cisco.network_plugin:PluginV2
      embrane = neutron.plugins.embrane.plugins.embrane_ml2_plugin:EmbraneMl2Plugin
-     midonet = neutron.plugins.midonet.plugin:MidonetPluginV2
      ml2 = neutron.plugins.ml2.plugin:Ml2Plugin
      nuage = neutron.plugins.nuage.plugin:NuagePlugin
      oneconvergence = neutron.plugins.oneconvergence.plugin:OneConvergencePluginV2