From: Jenkins <jenkins@review.openstack.org>
Date: Sun, 11 Jan 2015 17:48:22 +0000 (+0000)
Subject: Merge "Move metadata agent entry to its own file"
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=cd0cf84ee39fef9d2dffd08523cd0e66a2c879ec;p=openstack-build%2Fneutron-build.git

Merge "Move metadata agent entry to its own file"
---

cd0cf84ee39fef9d2dffd08523cd0e66a2c879ec
diff --cc setup.cfg
index e54f58cda,ba6537a01..ab04d570c
--- a/setup.cfg
+++ b/setup.cfg
@@@ -103,9 -103,9 +103,9 @@@ console_scripts 
      neutron-dhcp-agent = neutron.agent.dhcp_agent:main
      neutron-hyperv-agent = neutron.plugins.hyperv.agent.hyperv_neutron_agent:main
      neutron-ibm-agent = neutron.plugins.ibm.agent.sdnve_neutron_agent:main
 -    neutron-l3-agent = neutron.agent.l3.agent:main
 +    neutron-l3-agent = neutron.agent.l3_agent:main
      neutron-linuxbridge-agent = neutron.plugins.linuxbridge.agent.linuxbridge_neutron_agent:main
-     neutron-metadata-agent = neutron.agent.metadata.agent:main
+     neutron-metadata-agent = neutron.agent.metadata_agent:main
      neutron-mlnx-agent = neutron.plugins.mlnx.agent.eswitch_neutron_agent:main
      neutron-nec-agent = neutron.plugins.nec.agent.nec_neutron_agent:main
      neutron-netns-cleanup = neutron.agent.netns_cleanup_util:main