Merge pull request #6003 from zeha/dnsdist-packetcache-ttlcap

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

Mon, 8 Jan 2018 17:01:28 +0000 (18:01 +0100)

committer GitHub <noreply@github.com>

Mon, 8 Jan 2018 17:01:28 +0000 (18:01 +0100)
author Remi Gacogne <rgacogne@users.noreply.github.com>
Mon, 8 Jan 2018 17:01:28 +0000 (18:01 +0100)
committer GitHub <noreply@github.com>
Mon, 8 Jan 2018 17:01:28 +0000 (18:01 +0100)
diff --cc pdns/dnsdist-console.cc
Simple merge
diff --cc pdns/dnsdist.cc
Simple merge
diff --cc pdns/dnsdistdist/docs/rules-actions.rst
Simple merge
author	Remi Gacogne <rgacogne@users.noreply.github.com>
	Mon, 8 Jan 2018 17:01:28 +0000 (18:01 +0100)
committer	GitHub <noreply@github.com>
	Mon, 8 Jan 2018 17:01:28 +0000 (18:01 +0100)
		1	2
pdns/dnsdist-console.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/dnsdist.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/dnsdistdist/docs/rules-actions.rst	patch \|	diff1 \|	diff2 \|	blob \| history