]> granicus.if.org Git - pdns/commit
Merge remote-tracking branch 'origin/master' into dnsdist-to
authorbert hubert <bert.hubert@powerdns.com>
Mon, 4 Jan 2016 14:46:07 +0000 (15:46 +0100)
committerbert hubert <bert.hubert@powerdns.com>
Mon, 4 Jan 2016 14:46:07 +0000 (15:46 +0100)
commit291cb67f91842fcb4614f40d9e725a681f7e029b
tree7f50b454127f8620a7636a993e6cd6b38fd97eef
parent2a05b4a9007cf30b96af706f8b49e4013919a66b
parent55de3b43b3566e488e6d4ddcc24569f7f87401cb
Merge remote-tracking branch 'origin/master' into dnsdist-to

Conflicts:
pdns/dnsrulactions.hh
pdns/README-dnsdist.md
pdns/dnsdist-lua.cc
pdns/dnsdist-lua2.cc
pdns/dnsdist.hh