Merge lp://staging/~andreserl/maas/maas_packaging_conflicts into lp://staging/~maas-maintainers/maas/packaging
Proposed by
Andres Rodriguez
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Andres Rodriguez | ||||
Approved revision: | no longer in the source branch. | ||||
Merged at revision: | 63 | ||||
Proposed branch: | lp://staging/~andreserl/maas/maas_packaging_conflicts | ||||
Merge into: | lp://staging/~maas-maintainers/maas/packaging | ||||
Diff against target: |
66 lines (+10/-4) 4 files modified
debian/changelog (+3/-1) debian/control (+4/-0) debian/extras/maas-provision (+1/-1) debian/maas.postinst (+2/-2) |
||||
To merge this branch: | bzr merge lp://staging/~andreserl/maas/maas_packaging_conflicts | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Andres Rodriguez (community) | Approve | ||
Review via email: mp+121067@code.staging.launchpad.net |
Commit message
Add necessary Conflicts/Replaces.
debian/
To post a comment you must log in.