MAAS

Merge lp://staging/~andreserl/maas/maas_bzr_865 into lp://staging/~maas-maintainers/maas/packaging

  1. maas_bzr_865
  2. Merge into packaging
Proposed by Andres Rodriguez
Status: Merged
Approved by: Andres Rodriguez
Approved revision: no longer in the source branch.
Merged at revision: 60
Proposed branch: lp://staging/~andreserl/maas/maas_bzr_865
Merge into: lp://staging/~maas-maintainers/maas/packaging
Diff against target: 143 lines (+82/-5)
6 files modified
debian/changelog (+11/-1)
debian/control (+18/-1)
debian/maas-dns.dirs (+1/-0)
debian/maas-dns.postinst (+25/-0)
debian/maas-dns.postrm (+24/-0)
debian/maas.postinst (+3/-3)
To merge this branch: bzr merge lp://staging/~andreserl/maas/maas_bzr_865
Reviewer Review Type Date Requested Status
Julian Edwards (community) Approve
Review via email: mp+119210@code.staging.launchpad.net

Commit message

Add '/MAAS' to MAAS_DEFAULT_URL (LP: #1033956)
Add 'maas-dns' to enable related operations (LP: #1030860)

To post a comment you must log in.
Revision history for this message
Julian Edwards (julian-edwards) wrote :

Looks ok to my untrained eye, so unblocking you.

review: Approve
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/control

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/control

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

to all changes: