Merge pull request #10892 from mbiebl/revert-systemctl-runtime-unmask-breakage

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

Wed, 12 Dec 2018 13:23:04 +0000 (14:23 +0100)

committer GitHub <noreply@github.com>

Wed, 12 Dec 2018 13:23:04 +0000 (14:23 +0100)
author Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Wed, 12 Dec 2018 13:23:04 +0000 (14:23 +0100)
committer GitHub <noreply@github.com>
Wed, 12 Dec 2018 13:23:04 +0000 (14:23 +0100)
diff --cc src/shared/install.c
Simple merge
diff --cc src/systemctl/systemctl.c
Simple merge
author	Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
	Wed, 12 Dec 2018 13:23:04 +0000 (14:23 +0100)
committer	GitHub <noreply@github.com>
	Wed, 12 Dec 2018 13:23:04 +0000 (14:23 +0100)
		1	2
src/shared/install.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/systemctl/systemctl.c	patch \|	diff1 \|	diff2 \|	blob \| history