git.ipfire.org Git - thirdparty/pdns.git/commit

]> git.ipfire.org Git - thirdparty/pdns.git/commit

projects / thirdparty / pdns.git / commit

author	Ruben d'Arco <cyclops@prof-x.net>
	Thu, 18 Jul 2013 19:58:05 +0000 (21:58 +0200)
committer	Ruben d'Arco <cyclops@prof-x.net>
	Thu, 18 Jul 2013 19:58:05 +0000 (21:58 +0200)
commit	0677bef3372f1bba24cddff299eab213e5308a1b
tree	94cc3549cad5cfc113111786cc59bec44f6109d9	tree \| snapshot
parent	2d979ba0997c48ddcbc958a2d23baa189afeaad7	commit \| diff
parent	914353cadfd178585b98c115a692621d07f49d04	commit \| diff

Merge branch 'rfc2136' of https://github.com/mind04/pdns into rfc2136

Conflicts:
.travis.yml
pdns/common_startup.cc
pdns/dnspacket.cc
pdns/dnspacket.hh
regression-tests/start-test-stop

17 files changed:

.travis.yml	diff1 \|	diff2 \|	blob \| history
pdns/Makefile.am	diff1 \|	diff2 \|	blob \| history
pdns/backends/gsql/gsqlbackend.cc	diff1 \|	diff2 \|	blob \| history
pdns/common_startup.cc	diff1 \|	diff2 \|	blob \| history
pdns/dnsbackend.hh	diff1 \|	diff2 \|	blob \| history
pdns/dnspacket.cc	diff1 \|	diff2 \|	blob \| history
pdns/docs/pdns.xml	diff1 \|	diff2 \|	blob \| history
pdns/misc.hh	diff1 \|	diff2 \|	blob \| history
pdns/nameserver.cc	diff1 \|	diff2 \|	blob \| history
pdns/packethandler.cc	diff1 \|	diff2 \|	blob \| history
pdns/pdns.conf-dist	diff1 \|	diff2 \|	blob \| history
pdns/pdnssec.cc	diff1 \|	diff2 \|	blob \| history
pdns/resolver.cc	diff1 \|	diff2 \|	blob \| history
pdns/sdig.cc	diff1 \|	diff2 \|	blob \| history
pdns/slavecommunicator.cc	diff1 \|	diff2 \|	blob \| history
pdns/tcpreceiver.cc	diff1 \|	diff2 \|	blob \| history
regression-tests/start-test-stop	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom

.travis.yml	diff1 \|	diff2 \|	blob \| history
pdns/Makefile.am	diff1 \|	diff2 \|	blob \| history
pdns/backends/gsql/gsqlbackend.cc	diff1 \|	diff2 \|	blob \| history
pdns/common_startup.cc	diff1 \|	diff2 \|	blob \| history
pdns/dnsbackend.hh	diff1 \|	diff2 \|	blob \| history
pdns/dnspacket.cc	diff1 \|	diff2 \|	blob \| history
pdns/docs/pdns.xml	diff1 \|	diff2 \|	blob \| history
pdns/misc.hh	diff1 \|	diff2 \|	blob \| history
pdns/nameserver.cc	diff1 \|	diff2 \|	blob \| history
pdns/packethandler.cc	diff1 \|	diff2 \|	blob \| history
pdns/pdns.conf-dist	diff1 \|	diff2 \|	blob \| history
pdns/pdnssec.cc	diff1 \|	diff2 \|	blob \| history
pdns/resolver.cc	diff1 \|	diff2 \|	blob \| history
pdns/sdig.cc	diff1 \|	diff2 \|	blob \| history
pdns/slavecommunicator.cc	diff1 \|	diff2 \|	blob \| history
pdns/tcpreceiver.cc	diff1 \|	diff2 \|	blob \| history
regression-tests/start-test-stop	diff1 \|	diff2 \|	blob \| history