Merge lp://staging/~andreserl/maas/revert_rev5602_lp1686169_2.1 into lp://staging/maas/2.1
Proposed by
Andres Rodriguez
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Approved by: | Andres Rodriguez | ||||
| Approved revision: | no longer in the source branch. | ||||
| Merged at revision: | 5603 | ||||
| Proposed branch: | lp://staging/~andreserl/maas/revert_rev5602_lp1686169_2.1 | ||||
| Merge into: | lp://staging/maas/2.1 | ||||
| Diff against target: |
637 lines (+160/-251) 4 files modified
src/maasserver/bootresources.py (+63/-2) src/maasserver/tests/test_bootresources.py (+86/-59) src/provisioningserver/import_images/download_descriptions.py (+0/-72) src/provisioningserver/import_images/tests/test_download_descriptions.py (+11/-118) |
||||
| To merge this branch: | bzr merge lp://staging/~andreserl/maas/revert_rev5602_lp1686169_2.1 | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Andres Rodriguez (community) | Approve | ||
|
Review via email:
|
|||
This proposal supersedes a proposal from 2017-04-26.
Commit message
Revert rev5602, which fixed LP: #1686169. This causes rack controllers to fail importing images
To post a comment you must log in.
Revision history for this message
| Andres Rodriguez (andreserl) wrote | # |
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
selfie!