From: Doug Wiegley <dougw@a10networks.com>
Date: Mon, 31 Aug 2015 03:23:46 +0000 (-0600)
Subject: Merge remote-tracking branch 'origin/master' into merge-branch
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=2c5f44e1b3bd4ed8a0b7232fd293b576cc8c1c87;p=openstack-build%2Fneutron-build.git

Merge remote-tracking branch 'origin/master' into merge-branch

Change-Id: I9c29ad9564671ae5a2db35835bc4a30e75482cb2
---

2c5f44e1b3bd4ed8a0b7232fd293b576cc8c1c87
diff --cc setup.cfg
index f1bcddaf9,5f3de4db1..1c39d1c3c
--- a/setup.cfg
+++ b/setup.cfg
@@@ -102,9 -93,9 +93,10 @@@ console_scripts 
      neutron-nvsd-agent = neutron.plugins.oneconvergence.agent.nvsd_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
      neutron-restproxy-agent = neutron.plugins.bigswitch.agent.restproxy_agent:main
 -    neutron-server = neutron.cmd.eventlet.server:main
 +    neutron-server = neutron.cmd.eventlet.server:main_wsgi_eventlet
 +    neutron-dev-server = neutron.cmd.eventlet.server:main_wsgi_pecan
      neutron-rootwrap = oslo_rootwrap.cmd:main
      neutron-rootwrap-daemon = oslo_rootwrap.cmd:daemon
      neutron-usage-audit = neutron.cmd.usage_audit:main