Merge pull request #5936 from pieterlexis/api-allow-deactivate-dnssec

author aerique <aerique@xs4all.nl>

Thu, 16 Nov 2017 11:49:44 +0000 (12:49 +0100)

committer GitHub <noreply@github.com>

Thu, 16 Nov 2017 11:49:44 +0000 (12:49 +0100)
author aerique <aerique@xs4all.nl>
Thu, 16 Nov 2017 11:49:44 +0000 (12:49 +0100)
committer GitHub <noreply@github.com>
Thu, 16 Nov 2017 11:49:44 +0000 (12:49 +0100)
diff --cc pdns/pdnsutil.cc
Simple merge
diff --cc pdns/ws-auth.cc
Simple merge
diff --cc regression-tests.api/test_Zones.py
Simple merge
author	aerique <aerique@xs4all.nl>
	Thu, 16 Nov 2017 11:49:44 +0000 (12:49 +0100)
committer	GitHub <noreply@github.com>
	Thu, 16 Nov 2017 11:49:44 +0000 (12:49 +0100)
		1	2
pdns/pdnsutil.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/ws-auth.cc	patch \|	diff1 \|	diff2 \|	blob \| history
regression-tests.api/test_Zones.py	patch \|	diff1 \|	diff2 \|	blob \| history