Merge pull request #7869 from Habbie/auth-lua-reuse

author Peter van Dijk <peter.van.dijk@powerdns.com>

Tue, 4 Jun 2019 16:30:58 +0000 (18:30 +0200)

committer GitHub <noreply@github.com>

Tue, 4 Jun 2019 16:30:58 +0000 (18:30 +0200)
author Peter van Dijk <peter.van.dijk@powerdns.com>
Tue, 4 Jun 2019 16:30:58 +0000 (18:30 +0200)
committer GitHub <noreply@github.com>
Tue, 4 Jun 2019 16:30:58 +0000 (18:30 +0200)
diff --cc pdns/common_startup.cc
Simple merge
diff --cc pdns/common_startup.hh
Simple merge
author	Peter van Dijk <peter.van.dijk@powerdns.com>
	Tue, 4 Jun 2019 16:30:58 +0000 (18:30 +0200)
committer	GitHub <noreply@github.com>
	Tue, 4 Jun 2019 16:30:58 +0000 (18:30 +0200)
		1	2
pdns/common_startup.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/common_startup.hh	patch \|	diff1 \|	diff2 \|	blob \| history