Merge pull request #7569 from pieterlexis/pdnsutil-err-on-broken-masters

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

Thu, 2 May 2019 11:40:28 +0000 (13:40 +0200)

committer GitHub <noreply@github.com>

Thu, 2 May 2019 11:40:28 +0000 (13:40 +0200)
author Pieter Lexis <pieterlexis@users.noreply.github.com>
Thu, 2 May 2019 11:40:28 +0000 (13:40 +0200)
committer GitHub <noreply@github.com>
Thu, 2 May 2019 11:40:28 +0000 (13:40 +0200)
diff --cc pdns/backends/gsql/gsqlbackend.cc
Simple merge
diff --cc pdns/pdnsutil.cc
Simple merge
diff --cc pdns/ws-auth.cc
Simple merge
author	Pieter Lexis <pieterlexis@users.noreply.github.com>
	Thu, 2 May 2019 11:40:28 +0000 (13:40 +0200)
committer	GitHub <noreply@github.com>
	Thu, 2 May 2019 11:40:28 +0000 (13:40 +0200)
		1	2
pdns/backends/gsql/gsqlbackend.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/pdnsutil.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/ws-auth.cc	patch \|	diff1 \|	diff2 \|	blob \| history