Merge pull request #6616 from pfl/rdnss

author Lennart Poettering <lennart@poettering.net>

Thu, 7 Sep 2017 17:01:57 +0000 (19:01 +0200)

committer GitHub <noreply@github.com>

Thu, 7 Sep 2017 17:01:57 +0000 (19:01 +0200)
author Lennart Poettering <lennart@poettering.net>
Thu, 7 Sep 2017 17:01:57 +0000 (19:01 +0200)
committer GitHub <noreply@github.com>
Thu, 7 Sep 2017 17:01:57 +0000 (19:01 +0200)
diff --cc man/systemd.network.xml
Simple merge
diff --cc src/network/networkd-network-gperf.gperf
Simple merge
diff --cc src/network/networkd-network.c
Simple merge
diff --cc src/network/networkd-network.h
Simple merge
author	Lennart Poettering <lennart@poettering.net>
	Thu, 7 Sep 2017 17:01:57 +0000 (19:01 +0200)
committer	GitHub <noreply@github.com>
	Thu, 7 Sep 2017 17:01:57 +0000 (19:01 +0200)
		1	2
man/systemd.network.xml	patch \|	diff1 \|	diff2 \|	blob \| history
src/network/networkd-network-gperf.gperf	patch \|	diff1 \|	diff2 \|	blob \| history
src/network/networkd-network.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/network/networkd-network.h	patch \|	diff1 \|	diff2 \|	blob \| history