]> git.ipfire.org Git - thirdparty/pdns.git/commit
Merge remote-tracking branch 'main/master' into ednssurg 2773/head
authorbert hubert <bert.hubert@powerdns.com>
Fri, 2 Oct 2015 11:17:04 +0000 (13:17 +0200)
committerbert hubert <bert.hubert@powerdns.com>
Fri, 2 Oct 2015 11:17:04 +0000 (13:17 +0200)
commitd4ec6bf5083ab4d469013c47035023ccaade2488
tree55ea1ee320c412ba0a9a3305ed86ff2f627aa28c
parent69c887a2af754807aed0d52cd1cc21162589096b
parenta088ebed6e38d25b91b01d517c293f15eebcc91d
Merge remote-tracking branch 'main/master' into ednssurg

Conflicts:
.travis.yml
pdns/dnsdist-lua.cc
pdns/rec_channel_rec.cc
pdns/syncres.cc
pdns/syncres.hh
pdns/ws-auth.cc