Merge pull request #14805 from yuwata/network-ipv6-token-follow-up

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

Fri, 7 Feb 2020 16:05:33 +0000 (17:05 +0100)

committer GitHub <noreply@github.com>

Fri, 7 Feb 2020 16:05:33 +0000 (17:05 +0100)
author Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Fri, 7 Feb 2020 16:05:33 +0000 (17:05 +0100)
committer GitHub <noreply@github.com>
Fri, 7 Feb 2020 16:05:33 +0000 (17:05 +0100)
diff --cc man/systemd.network.xml
Simple merge
diff --cc test/test-network/systemd-networkd-tests.py
Simple merge
author	Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
	Fri, 7 Feb 2020 16:05:33 +0000 (17:05 +0100)
committer	GitHub <noreply@github.com>
	Fri, 7 Feb 2020 16:05:33 +0000 (17:05 +0100)
		1	2
man/systemd.network.xml	patch \|	diff1 \|	diff2 \|	blob \| history
test/test-network/systemd-networkd-tests.py	patch \|	diff1 \|	diff2 \|	blob \| history