Merge lp://staging/~lamont/maas/create-maas-proxy.conf-packaging into lp://staging/~maas-maintainers/maas/packaging

Proposed by LaMont Jones
Status: Merged
Approved by: LaMont Jones
Approved revision: no longer in the source branch.
Merged at revision: 474
Proposed branch: lp://staging/~lamont/maas/create-maas-proxy.conf-packaging
Merge into: lp://staging/~maas-maintainers/maas/packaging
Diff against target: 163 lines (+18/-52)
9 files modified
debian/changelog (+2/-0)
debian/extras/maas-proxy-common.sh (+1/-1)
debian/extras/maas-proxy.conf (+0/-40)
debian/maas-proxy.dirs (+1/-0)
debian/maas-proxy.install (+0/-1)
debian/maas-proxy.logrotate (+1/-1)
debian/maas-proxy.maas-proxy.service (+2/-2)
debian/maas-proxy.postinst (+10/-6)
debian/maas-proxy.postrm (+1/-1)
To merge this branch: bzr merge lp://staging/~lamont/maas/create-maas-proxy.conf-packaging
Reviewer Review Type Date Requested Status
Andres Rodriguez (community) Approve
Review via email: mp+290381@code.staging.launchpad.net

Commit message

Packaging changes for maas-proxy lockdown.

Description of the change

Packaging changes for maas-proxy lockdown.

To post a comment you must log in.
Revision history for this message
LaMont Jones (lamont) wrote :

This requires the corresponding branch in trunk. See https://code.launchpad.net/~lamont/maas/create-maas-proxy.conf/+merge/290154

Revision history for this message
Andres Rodriguez (andreserl) wrote :

lgtm! Just one remark!

review: Approve
Revision history for this message
LaMont Jones (lamont) wrote :

Updated.

Revision history for this message
MAAS Lander (maas-lander) wrote :

Attempt to merge into lp:~maas-maintainers/maas/packaging failed due to conflicts:

text conflict in debian/changelog

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches