Merge pull request #4724 from rgacogne/rec-lua-thread-id

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

Fri, 9 Dec 2016 08:56:49 +0000 (09:56 +0100)

committer GitHub <noreply@github.com>

Fri, 9 Dec 2016 08:56:49 +0000 (09:56 +0100)
author Pieter Lexis <pieterlexis@users.noreply.github.com>
Fri, 9 Dec 2016 08:56:49 +0000 (09:56 +0100)
committer GitHub <noreply@github.com>
Fri, 9 Dec 2016 08:56:49 +0000 (09:56 +0100)
diff --cc pdns/lua-recursor4.cc
Simple merge
diff --cc pdns/lua-recursor4.hh
Simple merge
diff --cc pdns/pdns_recursor.cc
Simple merge
author	Pieter Lexis <pieterlexis@users.noreply.github.com>
	Fri, 9 Dec 2016 08:56:49 +0000 (09:56 +0100)
committer	GitHub <noreply@github.com>
	Fri, 9 Dec 2016 08:56:49 +0000 (09:56 +0100)
		1	2
pdns/lua-recursor4.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/lua-recursor4.hh	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/pdns_recursor.cc	patch \|	diff1 \|	diff2 \|	blob \| history