From: Jenkins <jenkins@review.openstack.org>
Date: Mon, 2 Nov 2015 09:03:10 +0000 (+0000)
Subject: Merge "Decompose ML2 mechanism driver for Mellanox"
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=6f4ba78a8af9cc1f8f5c5a98723c543fbe081b15;p=openstack-build%2Fneutron-build.git

Merge "Decompose ML2 mechanism driver for Mellanox"
---

6f4ba78a8af9cc1f8f5c5a98723c543fbe081b15
diff --cc setup.cfg
index 40710585a,15cbd60f5..3eb8e8fa2
--- a/setup.cfg
+++ b/setup.cfg
@@@ -65,8 -65,8 +65,7 @@@ data_files 
          etc/neutron/plugins/ml2/ml2_conf_sriov.ini
          etc/neutron/plugins/ml2/openvswitch_agent.ini
          etc/neutron/plugins/ml2/sriov_agent.ini
-     etc/neutron/plugins/mlnx = etc/neutron/plugins/mlnx/mlnx_conf.ini
      etc/neutron/plugins/nuage = etc/neutron/plugins/nuage/nuage_plugin.ini
 -    etc/neutron/plugins/ovsvapp = etc/neutron/plugins/ovsvapp/ovsvapp_agent.ini
  scripts =
      bin/neutron-rootwrap-xen-dom0
  
@@@ -82,9 -82,9 +81,8 @@@ console_scripts 
      neutron-linuxbridge-agent = neutron.plugins.ml2.drivers.linuxbridge.agent.linuxbridge_neutron_agent:main
      neutron-linuxbridge-cleanup = neutron.cmd.linuxbridge_cleanup:main
      neutron-metadata-agent = neutron.cmd.eventlet.agents.metadata:main
-     neutron-mlnx-agent = neutron.cmd.eventlet.plugins.mlnx_neutron_agent:main
      neutron-netns-cleanup = neutron.cmd.netns_cleanup:main
      neutron-ns-metadata-proxy = neutron.cmd.eventlet.agents.metadata_proxy:main
 -    neutron-ovsvapp-agent = neutron.cmd.eventlet.plugins.ovsvapp_neutron_agent:main
      neutron-openvswitch-agent = neutron.cmd.eventlet.plugins.ovs_neutron_agent:main
      neutron-ovs-cleanup = neutron.cmd.ovs_cleanup:main
      neutron-pd-notify = neutron.cmd.pd_notify:main