Merge pull request #6030 from rgacogne/dnsdist-consistent-ids

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

Sat, 20 Jan 2018 00:19:23 +0000 (01:19 +0100)

committer GitHub <noreply@github.com>

Sat, 20 Jan 2018 00:19:23 +0000 (01:19 +0100)
author Peter van Dijk <peter.van.dijk@powerdns.com>
Sat, 20 Jan 2018 00:19:23 +0000 (01:19 +0100)
committer GitHub <noreply@github.com>
Sat, 20 Jan 2018 00:19:23 +0000 (01:19 +0100)
diff --cc pdns/dnsdist-console.cc
Simple merge
diff --cc pdns/dnsdist.cc
Simple merge
author	Peter van Dijk <peter.van.dijk@powerdns.com>
	Sat, 20 Jan 2018 00:19:23 +0000 (01:19 +0100)
committer	GitHub <noreply@github.com>
	Sat, 20 Jan 2018 00:19:23 +0000 (01:19 +0100)
		1	2
pdns/dnsdist-console.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/dnsdist.cc	patch \|	diff1 \|	diff2 \|	blob \| history