Merge pull request #6882 from phonedph1/throttle-map

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

Tue, 4 Sep 2018 07:58:38 +0000 (09:58 +0200)

committer GitHub <noreply@github.com>

Tue, 4 Sep 2018 07:58:38 +0000 (09:58 +0200)
author Remi Gacogne <rgacogne@users.noreply.github.com>
Tue, 4 Sep 2018 07:58:38 +0000 (09:58 +0200)
committer GitHub <noreply@github.com>
Tue, 4 Sep 2018 07:58:38 +0000 (09:58 +0200)
diff --cc pdns/rec_channel_rec.cc
Simple merge
diff --cc pdns/recursordist/docs/manpages/rec_control.1.rst
Simple merge
diff --cc pdns/syncres.cc
Simple merge
diff --cc pdns/syncres.hh
Simple merge
author	Remi Gacogne <rgacogne@users.noreply.github.com>
	Tue, 4 Sep 2018 07:58:38 +0000 (09:58 +0200)
committer	GitHub <noreply@github.com>
	Tue, 4 Sep 2018 07:58:38 +0000 (09:58 +0200)
		1	2
pdns/rec_channel_rec.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/recursordist/docs/manpages/rec_control.1.rst	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/syncres.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/syncres.hh	patch \|	diff1 \|	diff2 \|	blob \| history