Merge pull request #14448 from yuwata/network-permanent-mac-address

author Lennart Poettering <lennart@poettering.net>

Wed, 8 Jan 2020 14:36:27 +0000 (15:36 +0100)

committer GitHub <noreply@github.com>

Wed, 8 Jan 2020 14:36:27 +0000 (15:36 +0100)
author Lennart Poettering <lennart@poettering.net>
Wed, 8 Jan 2020 14:36:27 +0000 (15:36 +0100)
committer GitHub <noreply@github.com>
Wed, 8 Jan 2020 14:36:27 +0000 (15:36 +0100)
diff --cc man/systemd.network.xml
Simple merge
diff --cc src/network/networkctl.c
Simple merge
diff --cc src/network/networkd-link.c
Simple merge
author	Lennart Poettering <lennart@poettering.net>
	Wed, 8 Jan 2020 14:36:27 +0000 (15:36 +0100)
committer	GitHub <noreply@github.com>
	Wed, 8 Jan 2020 14:36:27 +0000 (15:36 +0100)
		1	2
man/systemd.network.xml	patch \|	diff1 \|	diff2 \|	blob \| history
src/network/networkctl.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/network/networkd-link.c	patch \|	diff1 \|	diff2 \|	blob \| history