Merge pull request #15891 from bluca/host_os_release

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

Wed, 8 Jul 2020 21:52:13 +0000 (23:52 +0200)

committer GitHub <noreply@github.com>

Wed, 8 Jul 2020 21:52:13 +0000 (23:52 +0200)
author Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Wed, 8 Jul 2020 21:52:13 +0000 (23:52 +0200)
committer GitHub <noreply@github.com>
Wed, 8 Jul 2020 21:52:13 +0000 (23:52 +0200)
diff --cc src/nspawn/nspawn.c
Simple merge
diff --cc src/portable/portable.c
Simple merge
author	Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
	Wed, 8 Jul 2020 21:52:13 +0000 (23:52 +0200)
committer	GitHub <noreply@github.com>
	Wed, 8 Jul 2020 21:52:13 +0000 (23:52 +0200)
		1	2
src/nspawn/nspawn.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/portable/portable.c	patch \|	diff1 \|	diff2 \|	blob \| history