]> git.ipfire.org Git - thirdparty/pdns.git/commit
projects / thirdparty / pdns.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 491d03d 47048e1)
Merge branch 'redistro' of github.com:ahupowerdns/pdns into redistro 2550/head
authorbert hubert <bert.hubert@netherlabs.nl>
Thu, 28 May 2015 11:55:38 +0000 (13:55 +0200)
committerbert hubert <bert.hubert@netherlabs.nl>
Thu, 28 May 2015 11:55:38 +0000 (13:55 +0200)
commit2af8277d6a05e3120abaa2bc08ca97ea0dfc9941
treed6e6e467931a86c206311b03c9e001e7ccb38fa2tree
parent491d03d7e0aad1e560ea5c1202c2dd4d00792074commit | diff
parent47048e1e008ead97b8a4628abd7b9d78c8475dafcommit | diff
Merge branch 'redistro' of github.com:ahupowerdns/pdns into redistro

Conflicts:
pdns/distributor.hh
pdns/distributor.hh diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.