Merge pull request #11927 from poettering/network-namespace-path

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

Tue, 12 Mar 2019 13:29:14 +0000 (14:29 +0100)

committer GitHub <noreply@github.com>

Tue, 12 Mar 2019 13:29:14 +0000 (14:29 +0100)
author Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Tue, 12 Mar 2019 13:29:14 +0000 (14:29 +0100)
committer GitHub <noreply@github.com>
Tue, 12 Mar 2019 13:29:14 +0000 (14:29 +0100)
diff --cc man/systemd.exec.xml
Simple merge
diff --cc src/core/execute.c
Simple merge
author	Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
	Tue, 12 Mar 2019 13:29:14 +0000 (14:29 +0100)
committer	GitHub <noreply@github.com>
	Tue, 12 Mar 2019 13:29:14 +0000 (14:29 +0100)
		1	2
man/systemd.exec.xml	patch \|	diff1 \|	diff2 \|	blob \| history
src/core/execute.c	patch \|	diff1 \|	diff2 \|	blob \| history