merge from trunk

7 years ago · 545e68e676
parent e28ebf6a38 c09a6c4e96
commit 545e68e676
2 changed files with 8 additions and 0 deletions
--- a/debian/changelog
+++ b/debian/changelog
@ -1,3 +1,10 @@
 livecd-rootfs (2.525.7) UNRELEASED; urgency=medium
  * Disable journald rate limiting in the live-server live session. 
    (LP: #1776891) 
 -- Michael Hudson-Doyle <michael.hudson@ubuntu.com>  Tue, 14 Aug 2018 21:41:53 -0700
 livecd-rootfs (2.525.6) bionic; urgency=medium
  [ Steve Langasek ]
--- a/live-build/ubuntu-server/includes.binary/overlay/etc/systemd/journald.conf.d/no-rate-limit.conf
+++ b/live-build/ubuntu-server/includes.binary/overlay/etc/systemd/journald.conf.d/no-rate-limit.conf
@ -0,0 +1 @@
 RateLimitIntervalSec=0