Merge remote-tracking branch 'origin/master' into webserver-logging

author Pieter Lexis <pieter.lexis@powerdns.com>

Thu, 14 Feb 2019 08:54:30 +0000 (09:54 +0100)

committer Pieter Lexis <pieter.lexis@powerdns.com>

Thu, 14 Feb 2019 08:54:30 +0000 (09:54 +0100)
author Pieter Lexis <pieter.lexis@powerdns.com>
Thu, 14 Feb 2019 08:54:30 +0000 (09:54 +0100)
committer Pieter Lexis <pieter.lexis@powerdns.com>
Thu, 14 Feb 2019 08:54:30 +0000 (09:54 +0100)
diff --cc configure.ac
Simple merge
diff --cc docs/settings.rst
Simple merge
diff --cc pdns/pdns_recursor.cc
Simple merge
diff --cc pdns/ws-auth.cc
Simple merge
author	Pieter Lexis <pieter.lexis@powerdns.com>
	Thu, 14 Feb 2019 08:54:30 +0000 (09:54 +0100)
committer	Pieter Lexis <pieter.lexis@powerdns.com>
	Thu, 14 Feb 2019 08:54:30 +0000 (09:54 +0100)
		1	2
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history
docs/settings.rst	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/pdns_recursor.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/ws-auth.cc	patch \|	diff1 \|	diff2 \|	blob \| history