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

Proposed by James Page
Status: Merged
Approved by: Chuck Short
Approved revision: 251
Merged at revision: 251
Proposed branch: lp:~james-page/neutron/rc1-fixes
Merge into: lp:~ubuntu-server-dev/neutron/icehouse
Diff against target: 25 lines (+10/-0)
2 files modified
debian/changelog (+9/-0)
debian/neutron-vpn-agent.install (+1/-0)
To merge this branch: bzr merge lp:~james-page/neutron/rc1-fixes
Reviewer Review Type Date Requested Status
Ubuntu Server Developers Pending
Review via email: mp+214582@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/changelog'
--- debian/changelog 2014-04-01 15:23:04 +0000
+++ debian/changelog 2014-04-07 17:12:34 +0000
@@ -1,3 +1,12 @@
1neutron (1:2014.1~rc1-0ubuntu2) UNRELEASED; urgency=medium
2
3 * d/neutron-plugin-oneconvergence-agent.upstart: Rename upstart
4 configuration to match package name (LP: #1301957).
5 * d/neutron-vpn-agent.install: Install missing vpnaas.filters for
6 rootwrap (LP: #1303876).
7
8 -- James Page <james.page@ubuntu.com> Mon, 07 Apr 2014 16:16:52 +0100
9
1neutron (1:2014.1~rc1-0ubuntu1) trusty; urgency=medium10neutron (1:2014.1~rc1-0ubuntu1) trusty; urgency=medium
211
3 [ Chuck Short ]12 [ Chuck Short ]
413
=== renamed file 'debian/neutron-plugin-onecovergence-agent.upstart' => 'debian/neutron-plugin-oneconvergence-agent.upstart'
=== modified file 'debian/neutron-vpn-agent.install'
--- debian/neutron-vpn-agent.install 2014-03-18 15:54:37 +0000
+++ debian/neutron-vpn-agent.install 2014-04-07 17:12:34 +0000
@@ -1,2 +1,3 @@
1etc/vpn_agent.ini etc/neutron1etc/vpn_agent.ini etc/neutron
2usr/bin/neutron-vpn-agent usr/bin2usr/bin/neutron-vpn-agent usr/bin
3etc/neutron/rootwrap.d/vpnaas.filters etc/neutron/rootwrap.d

Subscribers

People subscribed via source and target branches