Merge pull request #4123 from keszybz/network-file-dropins
authorMartin Pitt <martin.pitt@ubuntu.com>
Sat, 17 Sep 2016 08:00:19 +0000 (10:00 +0200)
committerGitHub <noreply@github.com>
Sat, 17 Sep 2016 08:00:19 +0000 (10:00 +0200)
commit6ac288a990251b39218fa219f03a2048124b9352
treeffb840c43202f5d9b479045e59652e4862a96000
parent0b493a02631d08bd2f48db8bc618dcd1fe3bdcb3
parent881e6b5edfd6ff82e0683678f19c887cbacab344
Merge pull request #4123 from keszybz/network-file-dropins

Network file dropins
man/systemd.netdev.xml
src/journal-remote/journal-remote.c
src/network/networkd-netdev.c
src/network/networkd-network.c