Merge pull request #7078 from rgacogne/dnsdist-creation-order

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

Wed, 31 Oct 2018 10:54:45 +0000 (11:54 +0100)

committer GitHub <noreply@github.com>

Wed, 31 Oct 2018 10:54:45 +0000 (11:54 +0100)
author Remi Gacogne <rgacogne@users.noreply.github.com>
Wed, 31 Oct 2018 10:54:45 +0000 (11:54 +0100)
committer GitHub <noreply@github.com>
Wed, 31 Oct 2018 10:54:45 +0000 (11:54 +0100)
diff --cc pdns/dnsdist-web.cc
Simple merge
diff --cc pdns/dnsdist.hh
Simple merge
diff --cc regression-tests.dnsdist/test_API.py
Simple merge
author	Remi Gacogne <rgacogne@users.noreply.github.com>
	Wed, 31 Oct 2018 10:54:45 +0000 (11:54 +0100)
committer	GitHub <noreply@github.com>
	Wed, 31 Oct 2018 10:54:45 +0000 (11:54 +0100)
		1	2
pdns/dnsdist-web.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/dnsdist.hh	patch \|	diff1 \|	diff2 \|	blob \| history
regression-tests.dnsdist/test_API.py	patch \|	diff1 \|	diff2 \|	blob \| history