]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
Merge pull request #2623 from poettering/networkd-fixes
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Tue, 16 Feb 2016 23:36:42 +0000 (18:36 -0500)
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Tue, 16 Feb 2016 23:36:42 +0000 (18:36 -0500)
Networkd, resolved, build-sys fixes

1  2 
src/resolve/resolved-manager.c

Simple merge