From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 6 Apr 2016 08:50:46 +0000 (+0200)
Subject: Merge pull request #2968 from keszybz/journal-upload-watchdog-update-master
X-Git-Tag: v230~208
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=354362c46bf436bb47fe6bd4be99321406119fa2;p=thirdparty%2Fsystemd.git

Merge pull request #2968 from keszybz/journal-upload-watchdog-update-master

Journal upload watchdog update master
---

354362c46bf436bb47fe6bd4be99321406119fa2