Merge pull request #8139 from rgacogne/dnsdist-kvs

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

Thu, 29 Aug 2019 07:49:40 +0000 (09:49 +0200)

committer GitHub <noreply@github.com>

Thu, 29 Aug 2019 07:49:40 +0000 (09:49 +0200)
author Remi Gacogne <rgacogne@users.noreply.github.com>
Thu, 29 Aug 2019 07:49:40 +0000 (09:49 +0200)
committer GitHub <noreply@github.com>
Thu, 29 Aug 2019 07:49:40 +0000 (09:49 +0200)
diff --cc build-scripts/travis.sh
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>
	Thu, 29 Aug 2019 07:49:40 +0000 (09:49 +0200)
committer	GitHub <noreply@github.com>
	Thu, 29 Aug 2019 07:49:40 +0000 (09:49 +0200)
		1	2
build-scripts/travis.sh	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/dnsdist.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/dnsdistdist/docs/rules-actions.rst	patch \|	diff1 \|	diff2 \|	blob \| history