Merge lp://staging/~mwhudson/livecd-rootfs/lp-1776891 into lp://staging/livecd-rootfs
Proposed by
Steve Langasek
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Merged at revision: | 1688 | ||||
| Proposed branch: | lp://staging/~mwhudson/livecd-rootfs/lp-1776891 | ||||
| Merge into: | lp://staging/livecd-rootfs | ||||
| Diff against target: |
34 lines (+10/-0) (has conflicts) 2 files modified
debian/changelog (+9/-0) live-build/ubuntu-server/includes.binary/overlay/etc/systemd/journald.conf.d/no-rate-limit.conf (+1/-0) Text conflict in debian/changelog |
||||
| To merge this branch: | bzr merge lp://staging/~mwhudson/livecd-rootfs/lp-1776891 | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Steve Langasek | Approve | ||
|
Review via email:
|
|||
To post a comment you must log in.
Revision history for this message
| Michael Hudson-Doyle (mwhudson) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
I think the reason I didn't propose this for merge is that even without the rate limiting, the logs that end up in the "full log view" in the event of failure are all but useless. But that's probably not related and this should go in.