Merge pull request #5380 from rgacogne/mastermake-shared

author Remi Gacogne <rgacogne@users.noreply.github.com>

Wed, 21 Jun 2017 09:39:57 +0000 (10:39 +0100)

committer GitHub <noreply@github.com>

Wed, 21 Jun 2017 09:39:57 +0000 (10:39 +0100)
author Remi Gacogne <rgacogne@users.noreply.github.com>
Wed, 21 Jun 2017 09:39:57 +0000 (10:39 +0100)
committer GitHub <noreply@github.com>
Wed, 21 Jun 2017 09:39:57 +0000 (10:39 +0100)
diff --cc pdns/lua-auth4.cc
Simple merge
diff --cc pdns/packethandler.cc
Simple merge
diff --cc pdns/pdnsutil.cc
Simple merge
diff --cc pdns/syncres.cc
Simple merge
diff --cc pdns/test-dnsrecords_cc.cc
Simple merge
diff --cc pdns/ws-auth.cc
Simple merge
author	Remi Gacogne <rgacogne@users.noreply.github.com>
	Wed, 21 Jun 2017 09:39:57 +0000 (10:39 +0100)
committer	GitHub <noreply@github.com>
	Wed, 21 Jun 2017 09:39:57 +0000 (10:39 +0100)
		1	2
pdns/lua-auth4.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/packethandler.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/pdnsutil.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/syncres.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/test-dnsrecords_cc.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/ws-auth.cc	patch \|	diff1 \|	diff2 \|	blob \| history