Merge pull request #5581 from rgacogne/ddist-console-con-logging

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

Thu, 10 Aug 2017 21:24:18 +0000 (23:24 +0200)

committer GitHub <noreply@github.com>

Thu, 10 Aug 2017 21:24:18 +0000 (23:24 +0200)
author Remi Gacogne <rgacogne@users.noreply.github.com>
Thu, 10 Aug 2017 21:24:18 +0000 (23:24 +0200)
committer GitHub <noreply@github.com>
Thu, 10 Aug 2017 21:24:18 +0000 (23:24 +0200)
diff --cc pdns/dnsdist.cc
Simple merge
diff --cc pdns/dnsdist.hh
Simple merge
diff --cc pdns/dnsdistdist/docs/reference/config.rst
Simple merge
author	Remi Gacogne <rgacogne@users.noreply.github.com>
	Thu, 10 Aug 2017 21:24:18 +0000 (23:24 +0200)
committer	GitHub <noreply@github.com>
	Thu, 10 Aug 2017 21:24:18 +0000 (23:24 +0200)
		1	2
pdns/dnsdist.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/dnsdist.hh	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/dnsdistdist/docs/reference/config.rst	patch \|	diff1 \|	diff2 \|	blob \| history