Merge pull request #9147 from keszybz/runtime-enablement

author Lennart Poettering <lennart@poettering.net>

Mon, 4 Jun 2018 09:58:21 +0000 (11:58 +0200)

committer GitHub <noreply@github.com>

Mon, 4 Jun 2018 09:58:21 +0000 (11:58 +0200)
author Lennart Poettering <lennart@poettering.net>
Mon, 4 Jun 2018 09:58:21 +0000 (11:58 +0200)
committer GitHub <noreply@github.com>
Mon, 4 Jun 2018 09:58:21 +0000 (11:58 +0200)
diff --cc src/journal/journal-file.c
Simple merge
diff --cc src/shared/install.c
Simple merge
diff --cc src/systemctl/systemctl.c
Simple merge
author	Lennart Poettering <lennart@poettering.net>
	Mon, 4 Jun 2018 09:58:21 +0000 (11:58 +0200)
committer	GitHub <noreply@github.com>
	Mon, 4 Jun 2018 09:58:21 +0000 (11:58 +0200)
		1	2
src/journal/journal-file.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/shared/install.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/systemctl/systemctl.c	patch \|	diff1 \|	diff2 \|	blob \| history