Merge lp:~jtv/maas/1.5-revert-bug-1311433 into lp:maas/1.5
Proposed by
Jeroen T. Vermeulen
Status: | Merged |
---|---|
Approved by: | Jeroen T. Vermeulen |
Approved revision: | no longer in the source branch. |
Merged at revision: | 2269 |
Proposed branch: | lp:~jtv/maas/1.5-revert-bug-1311433 |
Merge into: | lp:maas/1.5 |
Diff against target: |
35 lines (+3/-10) 1 file modified
src/maasserver/views/combo.py (+3/-10) |
To merge this branch: | bzr merge lp:~jtv/maas/1.5-revert-bug-1311433 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Raphaël Badin (community) | Approve | ||
Review via email:
|
This proposal supersedes a proposal from 2014-05-09.
Commit message
Revert 1.5 r2258: workaround for bug 1311433 (now properly fixed in Django).
Description of the change
Reverting this in the branches will save the distro people an unnecessary SRU.
Jeroen
To post a comment you must log in.
On 10/05/14 06:35, Jeroen T. Vermeulen wrote:
> The proposal to merge lp:~jtv/maas/1.5-revert-bug-1311433 into lp:maas/1.5 has been updated.
>
> Description changed to:
>
> Reverting this in the branches will save the distro people an unnecessary SRU.
Too late, it was already SRUed in the recent upload.