Merge pull request #7310 from rgacogne/dnsdist-dont-expunge-stale

author Pieter Lexis <pieterlexis@users.noreply.github.com>

Fri, 18 Jan 2019 10:04:07 +0000 (11:04 +0100)

committer GitHub <noreply@github.com>

Fri, 18 Jan 2019 10:04:07 +0000 (11:04 +0100)
author Pieter Lexis <pieterlexis@users.noreply.github.com>
Fri, 18 Jan 2019 10:04:07 +0000 (11:04 +0100)
committer GitHub <noreply@github.com>
Fri, 18 Jan 2019 10:04:07 +0000 (11:04 +0100)
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	Pieter Lexis <pieterlexis@users.noreply.github.com>
	Fri, 18 Jan 2019 10:04:07 +0000 (11:04 +0100)
committer	GitHub <noreply@github.com>
	Fri, 18 Jan 2019 10:04:07 +0000 (11:04 +0100)
		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