Merge pull request #6871 from chbruyand/auth-api-records-checks

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

Wed, 14 Nov 2018 08:44:14 +0000 (09:44 +0100)

committer GitHub <noreply@github.com>

Wed, 14 Nov 2018 08:44:14 +0000 (09:44 +0100)
author Pieter Lexis <pieterlexis@users.noreply.github.com>
Wed, 14 Nov 2018 08:44:14 +0000 (09:44 +0100)
committer GitHub <noreply@github.com>
Wed, 14 Nov 2018 08:44:14 +0000 (09:44 +0100)
diff --cc pdns/dnsrecords.cc
Simple merge
diff --cc pdns/dnsrecords.hh
Simple merge
diff --cc pdns/ws-auth.cc
Simple merge
author	Pieter Lexis <pieterlexis@users.noreply.github.com>
	Wed, 14 Nov 2018 08:44:14 +0000 (09:44 +0100)
committer	GitHub <noreply@github.com>
	Wed, 14 Nov 2018 08:44:14 +0000 (09:44 +0100)
		1	2
pdns/dnsrecords.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/dnsrecords.hh	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/ws-auth.cc	patch \|	diff1 \|	diff2 \|	blob \| history