Merge lp:~mwhudson/livecd-rootfs/lp-1776891-bionic into lp:~ubuntu-core-dev/livecd-rootfs/bionic-proposed

Proposed by Michael Hudson-Doyle
Status: Merged
Merged at revision: 1678
Proposed branch: lp:~mwhudson/livecd-rootfs/lp-1776891-bionic
Merge into: lp:~ubuntu-core-dev/livecd-rootfs/bionic-proposed
Diff against target: 24 lines (+6/-0)
2 files modified
debian/changelog (+5/-0)
live-build/ubuntu-server/includes.binary/overlay/etc/systemd/journald.conf.d/no-rate-limit.conf (+1/-0)
To merge this branch: bzr merge lp:~mwhudson/livecd-rootfs/lp-1776891-bionic
Reviewer Review Type Date Requested Status
Steve Langasek Approve
Review via email: mp+353134@code.launchpad.net

Description of the change

Simple cherry-pick.

To post a comment you must log in.
Revision history for this message
Steve Langasek (vorlon) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2018-08-02 04:00:39 +0000
3+++ debian/changelog 2018-08-15 00:04:52 +0000
4@@ -1,7 +1,12 @@
5 livecd-rootfs (2.525.6) UNRELEASED; urgency=medium
6
7+ [ Steve Langasek ]
8 * generate all tar files with --xattrs. LP: #1302192.
9
10+ [ Michael Hudson-Doyle ]
11+ * Disable journald rate limiting in the live-server live session.
12+ (LP: #1776891)
13+
14 -- Steve Langasek <steve.langasek@ubuntu.com> Wed, 01 Aug 2018 20:57:14 -0700
15
16 livecd-rootfs (2.525.5) bionic; urgency=medium
17
18=== added directory 'live-build/ubuntu-server/includes.binary/overlay/etc/systemd'
19=== added directory 'live-build/ubuntu-server/includes.binary/overlay/etc/systemd/journald.conf.d'
20=== added file 'live-build/ubuntu-server/includes.binary/overlay/etc/systemd/journald.conf.d/no-rate-limit.conf'
21--- live-build/ubuntu-server/includes.binary/overlay/etc/systemd/journald.conf.d/no-rate-limit.conf 1970-01-01 00:00:00 +0000
22+++ live-build/ubuntu-server/includes.binary/overlay/etc/systemd/journald.conf.d/no-rate-limit.conf 2018-08-15 00:04:52 +0000
23@@ -0,0 +1,1 @@
24+RateLimitIntervalSec=0

Subscribers

People subscribed via source and target branches