]> granicus.if.org Git - pdns/commit
rec: Fix 'worker' conflict with #6812
authorRemi Gacogne <remi.gacogne@powerdns.com>
Mon, 30 Jul 2018 13:24:07 +0000 (15:24 +0200)
committerRemi Gacogne <remi.gacogne@powerdns.com>
Mon, 30 Jul 2018 13:24:07 +0000 (15:24 +0200)
commit8fb594baf334db781f81fb5d6ffccb2a4d1ac34d
treece72d5433c4fc339ef5011b70b4422b4fe8a8919
parent62b549e0d9ce2e26dcfae9e14a10fd52b186c74e
rec: Fix 'worker' conflict with #6812
pdns/lua-recursor4.hh
pdns/pdns_recursor.cc