Merge pull request #7852 from Habbie/sqlite-wal

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

Tue, 4 Jun 2019 11:47:33 +0000 (13:47 +0200)

committer GitHub <noreply@github.com>

Tue, 4 Jun 2019 11:47:33 +0000 (13:47 +0200)
author Peter van Dijk <peter.van.dijk@powerdns.com>
Tue, 4 Jun 2019 11:47:33 +0000 (13:47 +0200)
committer GitHub <noreply@github.com>
Tue, 4 Jun 2019 11:47:33 +0000 (13:47 +0200)
diff --cc modules/bindbackend/bindbackend2.cc
Simple merge
diff --cc pdns/pdnsutil.cc
Simple merge
author	Peter van Dijk <peter.van.dijk@powerdns.com>
	Tue, 4 Jun 2019 11:47:33 +0000 (13:47 +0200)
committer	GitHub <noreply@github.com>
	Tue, 4 Jun 2019 11:47:33 +0000 (13:47 +0200)
		1	2
modules/bindbackend/bindbackend2.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/pdnsutil.cc	patch \|	diff1 \|	diff2 \|	blob \| history