]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
Merge pull request #2968 from keszybz/journal-upload-watchdog-update-master
authorLennart Poettering <lennart@poettering.net>
Wed, 6 Apr 2016 08:50:46 +0000 (10:50 +0200)
committerLennart Poettering <lennart@poettering.net>
Wed, 6 Apr 2016 08:50:46 +0000 (10:50 +0200)
Journal upload watchdog update master


Trivial merge