[Merge] lp:~james-page/neutron/rc1-fixes into lp:~ubuntu-server-dev/neutron/icehouse

[James Page]

James Page has proposed merging lp:~james-page/neutron/rc1-fixes into lp:~ubuntu-server-dev/neutron/icehouse.

Requested reviews:
  Ubuntu Server Developers (ubuntu-server-dev)
Related bugs:
  Bug #1301957 in neutron (Ubuntu): "one convergence agent upstart file misnamed"
  https://bugs.launchpad.net/ubuntu/+source/neutron/+bug/1301957
  Bug #1303876 in neutron (Ubuntu): "VPN agent dependencies are foobar"
  https://bugs.launchpad.net/ubuntu/+source/neutron/+bug/1303876

For more details, see:
https://code.launchpad.net/~james-page/neutron/rc1-fixes/+merge/214582
-- 
https://code.launchpad.net/~james-page/neutron/rc1-fixes/+merge/214582
Your team Ubuntu Server Developers is requested to review the proposed merge of lp:~james-page/neutron/rc1-fixes into lp:~ubuntu-server-dev/neutron/icehouse.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: review-diff.txt
Type: text/x-diff
Size: 1037 bytes
Desc: not available
URL: <https://lists.ubuntu.com/archives/ubuntu-reviews/attachments/20140407/16e16719/attachment.diff>