Merge pull request #7503 from ahupowerdns/auth-ringbugs

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

Wed, 20 Mar 2019 08:55:34 +0000 (09:55 +0100)

committer GitHub <noreply@github.com>

Wed, 20 Mar 2019 08:55:34 +0000 (09:55 +0100)
author Remi Gacogne <rgacogne@users.noreply.github.com>
Wed, 20 Mar 2019 08:55:34 +0000 (09:55 +0100)
committer GitHub <noreply@github.com>
Wed, 20 Mar 2019 08:55:34 +0000 (09:55 +0100)
diff --cc pdns/Makefile.am
Simple merge
diff --cc pdns/common_startup.cc
Simple merge
diff --cc pdns/responsestats-auth.cc
Simple merge
diff --cc pdns/ws-auth.cc
Simple merge
author	Remi Gacogne <rgacogne@users.noreply.github.com>
	Wed, 20 Mar 2019 08:55:34 +0000 (09:55 +0100)
committer	GitHub <noreply@github.com>
	Wed, 20 Mar 2019 08:55:34 +0000 (09:55 +0100)
		1	2
pdns/Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/common_startup.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/responsestats-auth.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/ws-auth.cc	patch \|	diff1 \|	diff2 \|	blob \| history