]> granicus.if.org Git - pdns/commit
Merge remote-tracking branch 'origin/master' into ednssubnet
authorbert hubert <bert.hubert@netherlabs.nl>
Wed, 11 Nov 2015 11:33:35 +0000 (12:33 +0100)
committerbert hubert <bert.hubert@netherlabs.nl>
Wed, 11 Nov 2015 11:33:35 +0000 (12:33 +0100)
commit6c674e9ac972306831916d84cfb04fb565c397c2
treeb0151416a1647567de994ba0b8c987cf52c24cba
parent6dd7e60cd24346085be86d9def50c17408ef4228
parent28837e84677df1f0230c368e42e24aff0cb401f0
Merge remote-tracking branch 'origin/master' into ednssubnet

Conflicts:
modules/geoipbackend/geoipbackend.cc
pdns/recursor_cache.cc
pdns/recursor_cache.hh
pdns/syncres.cc