From: Charles-Henri Bruyand <charles-henri.bruyand@open-xchange.com>
Date: Mon, 19 Mar 2018 10:20:04 +0000 (+0100)
Subject: Merge branch 'master' into issue-6346
X-Git-Tag: dnsdist-1.3.0~46^2~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=049ce644dcb02db4ed7bd6198052c181ed415279;p=thirdparty%2Fpdns.git

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
---

049ce644dcb02db4ed7bd6198052c181ed415279