diff -Nru neutron-7.0.0~b1/debian/changelog neutron-7.0.0~b1/debian/changelog --- neutron-7.0.0~b1/debian/changelog 2015-06-26 19:19:05.000000000 +0000 +++ neutron-7.0.0~b1/debian/changelog 2015-07-02 15:38:10.000000000 +0000 @@ -1,3 +1,10 @@ +neutron (2:7.0.0~b1-0ubuntu3) wily; urgency=medium + + * d/neutron-pluging-linuxbridge-agent.init.in: Ensure that the right + binary is used for neutron-plugin-linuxbridge-agent (LP: #1453188). + + -- James Page Thu, 02 Jul 2015 16:37:32 +0100 + neutron (2:7.0.0~b1-0ubuntu2) wily; urgency=medium * d/p/remove-ensure_dirs-double-patch.patch: Cherry pick fix from upstream diff -Nru neutron-7.0.0~b1/debian/neutron-plugin-linuxbridge-agent.init.in neutron-7.0.0~b1/debian/neutron-plugin-linuxbridge-agent.init.in --- neutron-7.0.0~b1/debian/neutron-plugin-linuxbridge-agent.init.in 2015-06-26 19:19:05.000000000 +0000 +++ neutron-7.0.0~b1/debian/neutron-plugin-linuxbridge-agent.init.in 2015-07-02 15:38:10.000000000 +0000 @@ -18,6 +18,7 @@ DESC="Openstack Neutron LinuxBridge Plugin Agent" PROJECT_NAME=neutron NAME=${PROJECT_NAME}-plugin-linuxbridge-agent +DAEMON=/usr/bin/neutron-linuxbridge-agent # --config-file=/etc/neutron/neutron.conf will be happened # to DAEMON_ARGS later by openstack-pkg-tools DAEMON_ARGS="--config-file=/etc/neutron/plugins/ml2/ml2_conf.ini"