Merge pull request #10059 from yuwata/env-exec-directory

author Lennart Poettering <lennart@poettering.net>

Tue, 25 Sep 2018 10:34:30 +0000 (12:34 +0200)

committer GitHub <noreply@github.com>

Tue, 25 Sep 2018 10:34:30 +0000 (12:34 +0200)
author Lennart Poettering <lennart@poettering.net>
Tue, 25 Sep 2018 10:34:30 +0000 (12:34 +0200)
committer GitHub <noreply@github.com>
Tue, 25 Sep 2018 10:34:30 +0000 (12:34 +0200)
diff --cc TODO
Simple merge
diff --cc src/basic/strv.c
Simple merge
diff --cc src/core/execute.c
Simple merge
diff --cc src/test/test-cgroup-util.c
Simple merge
author	Lennart Poettering <lennart@poettering.net>
	Tue, 25 Sep 2018 10:34:30 +0000 (12:34 +0200)
committer	GitHub <noreply@github.com>
	Tue, 25 Sep 2018 10:34:30 +0000 (12:34 +0200)
		1	2
TODO	patch \|	diff1 \|	diff2 \|	blob \| history
src/basic/strv.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/core/execute.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/test/test-cgroup-util.c	patch \|	diff1 \|	diff2 \|	blob \| history