Merge pull request #4123 from keszybz/network-file-dropins

author Martin Pitt <martin.pitt@ubuntu.com>

Sat, 17 Sep 2016 08:00:19 +0000 (10:00 +0200)

committer GitHub <noreply@github.com>

Sat, 17 Sep 2016 08:00:19 +0000 (10:00 +0200)
author Martin Pitt <martin.pitt@ubuntu.com>
Sat, 17 Sep 2016 08:00:19 +0000 (10:00 +0200)
committer GitHub <noreply@github.com>
Sat, 17 Sep 2016 08:00:19 +0000 (10:00 +0200)
diff --cc man/systemd.netdev.xml
Simple merge
diff --cc src/journal-remote/journal-remote.c
Simple merge
diff --cc src/network/networkd-netdev.c
Simple merge
diff --cc src/network/networkd-network.c
Simple merge
author	Martin Pitt <martin.pitt@ubuntu.com>
	Sat, 17 Sep 2016 08:00:19 +0000 (10:00 +0200)
committer	GitHub <noreply@github.com>
	Sat, 17 Sep 2016 08:00:19 +0000 (10:00 +0200)
		1	2
man/systemd.netdev.xml	patch \|	diff1 \|	diff2 \|	blob \| history
src/journal-remote/journal-remote.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/network/networkd-netdev.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/network/networkd-network.c	patch \|	diff1 \|	diff2 \|	blob \| history