Merge pull request #18990 from yuwata/network-dhcpv6-use-domains

author Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>

Wed, 31 Mar 2021 08:38:37 +0000 (10:38 +0200)

committer GitHub <noreply@github.com>

Wed, 31 Mar 2021 08:38:37 +0000 (10:38 +0200)
author Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Wed, 31 Mar 2021 08:38:37 +0000 (10:38 +0200)
committer GitHub <noreply@github.com>
Wed, 31 Mar 2021 08:38:37 +0000 (10:38 +0200)
diff --cc man/systemd.network.xml
Simple merge
diff --cc src/network/networkd-state-file.c
Simple merge
author	Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
	Wed, 31 Mar 2021 08:38:37 +0000 (10:38 +0200)
committer	GitHub <noreply@github.com>
	Wed, 31 Mar 2021 08:38:37 +0000 (10:38 +0200)
		1	2
man/systemd.network.xml	patch \|	diff1 \|	diff2 \|	blob \| history
src/network/networkd-state-file.c	patch \|	diff1 \|	diff2 \|	blob \| history