Merge pull request #5774 from ahupowerdns/our-latency-metric

author aerique <aerique@xs4all.nl>

Wed, 25 Oct 2017 11:54:29 +0000 (13:54 +0200)

committer GitHub <noreply@github.com>

Wed, 25 Oct 2017 11:54:29 +0000 (13:54 +0200)
author aerique <aerique@xs4all.nl>
Wed, 25 Oct 2017 11:54:29 +0000 (13:54 +0200)
committer GitHub <noreply@github.com>
Wed, 25 Oct 2017 11:54:29 +0000 (13:54 +0200)
diff --cc pdns/pdns_recursor.cc
Simple merge
diff --cc pdns/syncres.cc
Simple merge
diff --cc pdns/syncres.hh
Simple merge
author	aerique <aerique@xs4all.nl>
	Wed, 25 Oct 2017 11:54:29 +0000 (13:54 +0200)
committer	GitHub <noreply@github.com>
	Wed, 25 Oct 2017 11:54:29 +0000 (13:54 +0200)
		1	2
pdns/pdns_recursor.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/syncres.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/syncres.hh	patch \|	diff1 \|	diff2 \|	blob \| history