Merge pull request #15504 from poettering/cmsg-find-pure

author Lennart Poettering <lennart@poettering.net>

Thu, 23 Apr 2020 15:28:19 +0000 (17:28 +0200)

committer GitHub <noreply@github.com>

Thu, 23 Apr 2020 15:28:19 +0000 (17:28 +0200)
author Lennart Poettering <lennart@poettering.net>
Thu, 23 Apr 2020 15:28:19 +0000 (17:28 +0200)
committer GitHub <noreply@github.com>
Thu, 23 Apr 2020 15:28:19 +0000 (17:28 +0200)
diff --cc src/journal/journald-server.c
Simple merge
diff --cc src/nspawn/nspawn.c
Simple merge
diff --cc src/resolve/resolved-manager.c
Simple merge
author	Lennart Poettering <lennart@poettering.net>
	Thu, 23 Apr 2020 15:28:19 +0000 (17:28 +0200)
committer	GitHub <noreply@github.com>
	Thu, 23 Apr 2020 15:28:19 +0000 (17:28 +0200)
		1	2
src/journal/journald-server.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/nspawn/nspawn.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/resolve/resolved-manager.c	patch \|	diff1 \|	diff2 \|	blob \| history