projects / systemd / .git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e056af1 11bb514)
Merge pull request #2287 from dandedrick/journal-gatewayd-timeout-fix
authorDaniel Mack <github@zonque.org>
Fri, 8 Jan 2016 08:25:21 +0000 (09:25 +0100)
committerDaniel Mack <github@zonque.org>
Fri, 8 Jan 2016 08:25:21 +0000 (09:25 +0100)
journal-gatewayd: timeout journal wait to allow thread cleanup


Trivial merge
https://github.com/systemd/systemd.git