Merge lp://qastaging/~andreserl/maas/packaging_1.7.4 into lp://qastaging/~maas-maintainers/maas/packaging.utopic

Proposed by Andres Rodriguez
Status: Merged
Approved by: Andres Rodriguez
Approved revision: 368
Merged at revision: 362
Proposed branch: lp://qastaging/~andreserl/maas/packaging_1.7.4
Merge into: lp://qastaging/~maas-maintainers/maas/packaging.utopic
Diff against target: 306 lines (+172/-10)
12 files modified
debian/changelog (+27/-6)
debian/control (+4/-1)
debian/extras/maas-region-admin (+7/-0)
debian/maas-cluster-controller.maas-clusterd.service (+21/-0)
debian/maas-dhcp.maas-dhcpd.service (+27/-0)
debian/maas-dhcp.maas-dhcpd6.service (+27/-0)
debian/maas-dhcp.postinst (+6/-1)
debian/maas-proxy.maas-proxy.service (+15/-0)
debian/maas-proxy.postinst (+6/-1)
debian/patches/03-fix-wsgi-djang16.patch (+18/-0)
debian/patches/series (+1/-0)
debian/rules (+13/-1)
To merge this branch: bzr merge lp://qastaging/~andreserl/maas/packaging_1.7.4
Reviewer Review Type Date Requested Status
Andres Rodriguez (community) Approve
Raphaël Badin (community) Approve
Review via email: mp+258709@code.qastaging.launchpad.net

Commit message

Release 1.7.4+bzr3366-0ubuntu1
Open 1.7.5+bzr3366-0ubuntu1

To post a comment you must log in.
Revision history for this message
Andres Rodriguez (andreserl) wrote :

Raphael,

Is (LP: #1387859) the only bug for 1.7.4??

Also, would you rather have 03-fix-wsgi-djang16.patch landed in 1.7 branch or should just stay as a packaging branch?

The only other thing needed is upgrade testing from 1.7 in utopic, to a 1.8 in another flavor of MAAS.

Revision history for this message
Raphaël Badin (rvb) wrote :

> Raphael,
>
> Is (LP: #1387859) the only bug for 1.7.4??

There is also bug 1329267. Gavin landed the fix on 1.7 this morning (changelog has been updated).

> Also, would you rather have 03-fix-wsgi-djang16.patch landed in 1.7 branch or
> should just stay as a packaging branch?

Since it's a bit of a hack, I'm happy if it stays in the packaging.

> The only other thing needed is upgrade testing from 1.7 in utopic, to a 1.8 in
> another flavor of MAAS.

Right.

Revision history for this message
Raphaël Badin (rvb) :
review: Approve
Revision history for this message
Andres Rodriguez (andreserl) :
review: Approve

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: