Merge lp://staging/~cody-somerville/base-installer/fix-final_apt_preferences-waypoint-failure-with-live-installer into lp://staging/~ubuntu-core-dev/base-installer/ubuntu
Proposed by
Cody A.W. Somerville
| Status: | Merged |
|---|---|
| Merged at revision: | 405 |
| Proposed branch: | lp://staging/~cody-somerville/base-installer/fix-final_apt_preferences-waypoint-failure-with-live-installer |
| Merge into: | lp://staging/~ubuntu-core-dev/base-installer/ubuntu |
| Diff against target: |
47 lines (+14/-7) 3 files modified
debian/base-installer.templates (+6/-0) debian/bootstrap-base.templates (+0/-7) debian/changelog (+8/-0) |
| To merge this branch: | bzr merge lp://staging/~cody-somerville/base-installer/fix-final_apt_preferences-waypoint-failure-with-live-installer |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Colin Watson (community) | Approve | ||
|
Review via email:
|
|||
Commit message
* Backport from trunk:
- Move base-installer/
Description of the change
Backport from trunk:
- Move base-installer/
to base-installer.
This will permit live-installer installs to complete successfully.
Feel free to just ping me on IRC and tell me this looks good and I'll take care of committing and doing the upload - whatever is most convenient for you.
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
This is fine, thanks. I'll take care of the merge and upload now.
review approve