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)
commit354362c46bf436bb47fe6bd4be99321406119fa2
treeb161da21bcea4ad2bb4f71f6d9f70b16ae2b3469
parentd4337c15d5835c8eecf079bd5173f8b5c51727c7
parent0aa176a751a00b5645007c4d0763078ce2824aba
Merge pull request #2968 from keszybz/journal-upload-watchdog-update-master

Journal upload watchdog update master