Merge pull request #4912 from pieterlexis/issue-4848-chroot-systemd

author Pieter Lexis <pieterlexis@users.noreply.github.com>

Fri, 17 Feb 2017 10:00:38 +0000 (11:00 +0100)

committer GitHub <noreply@github.com>

Fri, 17 Feb 2017 10:00:38 +0000 (11:00 +0100)
author Pieter Lexis <pieterlexis@users.noreply.github.com>
Fri, 17 Feb 2017 10:00:38 +0000 (11:00 +0100)
committer GitHub <noreply@github.com>
Fri, 17 Feb 2017 10:00:38 +0000 (11:00 +0100)
diff --cc docs/markdown/authoritative/settings.md
Simple merge
diff --cc docs/markdown/recursor/settings.md
Simple merge
diff --cc pdns/pdns_recursor.cc
Simple merge
author	Pieter Lexis <pieterlexis@users.noreply.github.com>
	Fri, 17 Feb 2017 10:00:38 +0000 (11:00 +0100)
committer	GitHub <noreply@github.com>
	Fri, 17 Feb 2017 10:00:38 +0000 (11:00 +0100)
		1	2
docs/markdown/authoritative/settings.md	patch \|	diff1 \|	diff2 \|	blob \| history
docs/markdown/recursor/settings.md	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/pdns_recursor.cc	patch \|	diff1 \|	diff2 \|	blob \| history