]> granicus.if.org Git - pdns/commitdiff
projects / pdns / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a3928ac c40b447)
Merge remote-tracking branch 'origin/master' into alias-servfail-on-nxd
authorPieter Lexis <pieter.lexis@powerdns.com>
Mon, 1 Oct 2018 06:48:17 +0000 (08:48 +0200)
committerPieter Lexis <pieter.lexis@powerdns.com>
Mon, 1 Oct 2018 06:48:17 +0000 (08:48 +0200)
1  2 
pdns/dnsproxy.cc patch | diff1 | diff2 | blob | history

diff --cc pdns/dnsproxy.cc
Simple merge
Unnamed repository; edit this file 'description' to name the repository.