]> granicus.if.org Git - pdns/commit
projects / pdns / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: fbd6b77 ad16c97)
Merge branch 'master' into issue-6346
authorCharles-Henri Bruyand <charles-henri.bruyand@open-xchange.com>
Mon, 19 Mar 2018 10:20:04 +0000 (11:20 +0100)
committerCharles-Henri Bruyand <charles-henri.bruyand@open-xchange.com>
Mon, 19 Mar 2018 10:20:04 +0000 (11:20 +0100)
commit049ce644dcb02db4ed7bd6198052c181ed415279
tree70549b941effcac43de9a8bedd33923b7b5dfe63tree | snapshot
parentfbd6b779245b32f6db02a85ac0e6430ec2477737commit | diff
parentad16c97cf1a7547dcda27f7bc08d529e5125e073commit | diff
Merge branch 'master' into issue-6346

* master:
  use mirror for dnsperf
  rather than crash, sheepishly report no file/linenum
  dnsdist: Update deprecated syntax used in dist configuration file
  Update secpoll
  build lua2 backend packages
  calidns: Add the --ecs parameter to add random ECS values to queries
Unnamed repository; edit this file 'description' to name the repository.