]> granicus.if.org Git - pdns/commit
Merge branch 'master' into dnsrr
authorbert hubert <bert.hubert@netherlabs.nl>
Thu, 23 Feb 2017 12:30:37 +0000 (13:30 +0100)
committerGitHub <noreply@github.com>
Thu, 23 Feb 2017 12:30:37 +0000 (13:30 +0100)
commitafad964a6e4921f91ed8859907abed40307b566b
tree0e3b0a3ddb5307671546d1c7b874ad6285bdc882
parentbb7123d34d487095732cc08749fc531e7c116e4b
parent45879fae66a5fbc37d1edf32b2b9337383140d2f
Merge branch 'master' into dnsrr
14 files changed:
modules/geoipbackend/geoipbackend.cc
pdns/backends/gsql/gsqlbackend.cc
pdns/communicator.hh
pdns/dnsparser.cc
pdns/mastercommunicator.cc
pdns/misc.hh
pdns/pdnsutil.cc
pdns/qtype.hh
pdns/rfc2136handler.cc
pdns/slavecommunicator.cc
pdns/tcpreceiver.cc
pdns/ueberbackend.cc
pdns/ueberbackend.hh
pdns/zoneparser-tng.cc