Merge pull request #6825 from klaus3000/disable-signed-NOTIFYs

author Remi Gacogne <rgacogne@users.noreply.github.com>

Mon, 20 Aug 2018 06:25:50 +0000 (08:25 +0200)

committer GitHub <noreply@github.com>

Mon, 20 Aug 2018 06:25:50 +0000 (08:25 +0200)
author Remi Gacogne <rgacogne@users.noreply.github.com>
Mon, 20 Aug 2018 06:25:50 +0000 (08:25 +0200)
committer GitHub <noreply@github.com>
Mon, 20 Aug 2018 06:25:50 +0000 (08:25 +0200)
diff --cc docs/settings.rst
Simple merge
diff --cc pdns/common_startup.cc
Simple merge
author	Remi Gacogne <rgacogne@users.noreply.github.com>
	Mon, 20 Aug 2018 06:25:50 +0000 (08:25 +0200)
committer	GitHub <noreply@github.com>
	Mon, 20 Aug 2018 06:25:50 +0000 (08:25 +0200)
		1	2
docs/settings.rst	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/common_startup.cc	patch \|	diff1 \|	diff2 \|	blob \| history