livecd-rootfs

Merge lp:~mwhudson/livecd-rootfs/lp-1776891 into lp:livecd-rootfs

  1. lp-1776891
  2. Merge into trunk
Proposed by Steve Langasek
Status: Merged
Merged at revision: 1688
Proposed branch: lp:~mwhudson/livecd-rootfs/lp-1776891
Merge into: lp: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:~mwhudson/livecd-rootfs/lp-1776891
Reviewer Review Type Date Requested Status
Steve Langasek Approve
Review via email: mp+351814@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Michael Hudson-Doyle (mwhudson) wrote :

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.

Revision history for this message
Steve Langasek (vorlon) wrote :

yeah, +1 from me, modulo the changelog con.flicts

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-07-18 17:07:30 +0000
3+++ debian/changelog 2018-07-30 18:01:43 +0000
4@@ -2,6 +2,7 @@
5
6 [ Robert C Jennings ]
7 * ubuntu-cpc: Remove git-man for minimized images
8+<<<<<<< TREE
9 * Disable checksum generation
10
11 [ Colin Watson ]
12@@ -13,6 +14,14 @@
13 unminimizing a minimal image (LP: #1778777)
14
15 -- Adam Conrad <adconrad@ubuntu.com> Wed, 18 Jul 2018 11:06:54 -0600
16+=======
17+
18+ [ Michael Hudson-Doyle ]
19+ * Disable journald rate limiting in the live-server live session.
20+ (LP: #1776891)
21+
22+ -- Robert C Jennings <robert.jennings@canonical.com> Fri, 08 Jun 2018 10:10:53 -0700
23+>>>>>>> MERGE-SOURCE
24
25 livecd-rootfs (2.532) cosmic; urgency=medium
26
27
28=== added directory 'live-build/ubuntu-server/includes.binary/overlay/etc/systemd'
29=== added directory 'live-build/ubuntu-server/includes.binary/overlay/etc/systemd/journald.conf.d'
30=== added file 'live-build/ubuntu-server/includes.binary/overlay/etc/systemd/journald.conf.d/no-rate-limit.conf'
31--- live-build/ubuntu-server/includes.binary/overlay/etc/systemd/journald.conf.d/no-rate-limit.conf 1970-01-01 00:00:00 +0000
32+++ live-build/ubuntu-server/includes.binary/overlay/etc/systemd/journald.conf.d/no-rate-limit.conf 2018-07-30 18:01:43 +0000
33@@ -0,0 +1,1 @@
34+RateLimitIntervalSec=0

Subscribers

People subscribed via source and target branches