Merge pull request #4288 from rgacogne/rec-async-protobuf-startup

author bert hubert <bert.hubert@netherlabs.nl>

Thu, 25 Aug 2016 08:39:41 +0000 (10:39 +0200)

committer GitHub <noreply@github.com>

Thu, 25 Aug 2016 08:39:41 +0000 (10:39 +0200)
author bert hubert <bert.hubert@netherlabs.nl>
Thu, 25 Aug 2016 08:39:41 +0000 (10:39 +0200)
committer GitHub <noreply@github.com>
Thu, 25 Aug 2016 08:39:41 +0000 (10:39 +0200)
diff --cc docs/markdown/recursor/settings.md
Simple merge
diff --cc pdns/misc.cc
Simple merge
diff --cc pdns/rec-lua-conf.cc
Simple merge
author	bert hubert <bert.hubert@netherlabs.nl>
	Thu, 25 Aug 2016 08:39:41 +0000 (10:39 +0200)
committer	GitHub <noreply@github.com>
	Thu, 25 Aug 2016 08:39:41 +0000 (10:39 +0200)
		1	2
docs/markdown/recursor/settings.md	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/misc.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/rec-lua-conf.cc	patch \|	diff1 \|	diff2 \|	blob \| history