]> granicus.if.org Git - pdns/log
pdns
9 years agouse = instead of == in shell tests, this makes the configure 'Portability.' patch...
Peter van Dijk [Mon, 12 Jan 2015 15:47:57 +0000 (16:47 +0100)]
use = instead of == in shell tests, this makes the configure 'Portability.' patch from pkgsrc obsolete

9 years agoimport 'Add DragonFly support.' from pkgsrc
Peter van Dijk [Mon, 12 Jan 2015 15:38:20 +0000 (16:38 +0100)]
import 'Add DragonFly support.' from pkgsrc

9 years agoMerge pull request #2129 from cmouse/test-dnsrecords-run-serialize-badvalue
Peter van Dijk [Mon, 26 Jan 2015 14:36:10 +0000 (15:36 +0100)]
Merge pull request #2129 from cmouse/test-dnsrecords-run-serialize-badvalue

Run serialize on test-dnsrecords for invalid record values

9 years agoMerge pull request #2127 from zeha/replace-jsonstat
Peter van Dijk [Mon, 26 Jan 2015 14:35:49 +0000 (15:35 +0100)]
Merge pull request #2127 from zeha/replace-jsonstat

JSON API: provide flush-cache, notify, axfr-receive

9 years agoMerge pull request #2124 from zeha/docs-2064
Peter van Dijk [Mon, 26 Jan 2015 14:34:42 +0000 (15:34 +0100)]
Merge pull request #2124 from zeha/docs-2064

Improve API docs a bit

9 years agoMerge pull request #2120 from pommi/fix-backend-capabilities-table
Peter van Dijk [Mon, 26 Jan 2015 14:34:09 +0000 (15:34 +0100)]
Merge pull request #2120 from pommi/fix-backend-capabilities-table

docs/markdown: fix column order in backend capabilities table

9 years agoMerge pull request #2122 from rubenk/replace-cryptopp-lib-with-var
Peter van Dijk [Mon, 26 Jan 2015 13:56:41 +0000 (14:56 +0100)]
Merge pull request #2122 from rubenk/replace-cryptopp-lib-with-var

Replace hardcoded -lcryptopp with variable

9 years agoMerge pull request #2121 from rubenk/add-disable-hardening-option
Peter van Dijk [Mon, 26 Jan 2015 13:56:33 +0000 (14:56 +0100)]
Merge pull request #2121 from rubenk/add-disable-hardening-option

Add an option to disable hardening

9 years agoMerge pull request #2117 from rubenk/coverage-support
Peter van Dijk [Mon, 26 Jan 2015 13:55:45 +0000 (14:55 +0100)]
Merge pull request #2117 from rubenk/coverage-support

Add --enable-coverage for coverage instrumentation

9 years agoMerge pull request #2105 from rubenk/cleanup-some-whitespace-in-Makefile-am
Peter van Dijk [Mon, 26 Jan 2015 13:55:36 +0000 (14:55 +0100)]
Merge pull request #2105 from rubenk/cleanup-some-whitespace-in-Makefile-am

Cleanup some whitespace

9 years agoMerge pull request #2123 from rubenk/stop-checking-for-size_t
Peter van Dijk [Mon, 26 Jan 2015 12:22:20 +0000 (13:22 +0100)]
Merge pull request #2123 from rubenk/stop-checking-for-size_t

Stop checking for size_t

9 years agoCleanup some whitespace
Ruben Kerkhof [Tue, 20 Jan 2015 09:45:09 +0000 (10:45 +0100)]
Cleanup some whitespace

9 years agoMerge pull request #2007 from rubenk/dont-link-pgsql-backend-with-ssl-crypt-and-crypto
Peter van Dijk [Mon, 26 Jan 2015 12:13:35 +0000 (13:13 +0100)]
Merge pull request #2007 from rubenk/dont-link-pgsql-backend-with-ssl-crypt-and-crypto

Stop linking with pgsql with hardcoded -lssl

9 years agoMerge pull request #2044 from rubenk/travis-use-botan
Peter van Dijk [Mon, 26 Jan 2015 12:12:34 +0000 (13:12 +0100)]
Merge pull request #2044 from rubenk/travis-use-botan

Enable botan in Travis

9 years agoMerge pull request #2118 from rubenk/recursor-fixes
Peter van Dijk [Mon, 26 Jan 2015 08:35:57 +0000 (09:35 +0100)]
Merge pull request #2118 from rubenk/recursor-fixes

Link the binary with -fstack-protector

9 years agoMove overly large label tests to correct place
Aki Tuomi [Sun, 25 Jan 2015 22:03:27 +0000 (00:03 +0200)]
Move overly large label tests to correct place

9 years agoTry serialize invalid values to test certain assertions during serialization
Aki Tuomi [Sun, 25 Jan 2015 22:02:00 +0000 (00:02 +0200)]
Try serialize invalid values to test certain assertions during serialization

9 years agoJSON API: provide flush-cache, notify, axfr-receive
Christian Hofstaedtler [Sun, 25 Jan 2015 21:16:08 +0000 (22:16 +0100)]
JSON API: provide flush-cache, notify, axfr-receive

pdnscontrol used to send pdns/rec-control commands for those through
the jsonstat command tunnel, but jsonstat (on Auth at least) doesn't
do X-API-Key, so that functionality was broken.

Also removes jsonstat from Auth completely and leaves only non-migrated
commands in jsonstat in Recursor.

9 years agoImprove API docs a bit
Christian Hofstaedtler [Sun, 25 Jan 2015 18:27:39 +0000 (19:27 +0100)]
Improve API docs a bit

Based on feedback from issue #2064; no idea so far how to better
describe how comments work.

9 years agoAdd --enable-coverage for coverage instrumentation
Ruben Kerkhof [Sat, 24 Jan 2015 22:10:25 +0000 (23:10 +0100)]
Add --enable-coverage for coverage instrumentation

9 years agoour houseKeeping mthread could (and would) frequently be run several times simultaneo...
bert hubert [Sun, 25 Jan 2015 15:59:25 +0000 (16:59 +0100)]
our houseKeeping mthread could (and would) frequently be run several times simultaneously. It is great that this worked. But let's not ;-)

9 years agoStop checking for size_t
Ruben Kerkhof [Sun, 25 Jan 2015 14:02:46 +0000 (15:02 +0100)]
Stop checking for size_t

We use it all over the place unconditionally.

9 years agoReplace hardcoded -lcryptopp with variable
Ruben Kerkhof [Sun, 25 Jan 2015 13:03:47 +0000 (14:03 +0100)]
Replace hardcoded -lcryptopp with variable

9 years agodocs/markdown: fix column order in backend capabilities table
Pim van den Berg [Sun, 25 Jan 2015 12:47:58 +0000 (13:47 +0100)]
docs/markdown: fix column order in backend capabilities table

Column order of BIND and Geo were wrong.

9 years agoAdd an option to disable hardening
Ruben Kerkhof [Sun, 25 Jan 2015 12:43:19 +0000 (13:43 +0100)]
Add an option to disable hardening

This makes debugging hardening problems easier

--disable-hardening disables PIE, -fstack-protector,
-D_FORTIFY_SOURCE and -z relro

9 years agoLink the binary with -fstack-protector
Ruben Kerkhof [Sun, 25 Jan 2015 00:19:42 +0000 (01:19 +0100)]
Link the binary with -fstack-protector

This fixes the build on FreeBSD 9.2 i386

For the gory details, see
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=168010

9 years agoMerge pull request #2116 from rubenk/recursor-fixes
bert hubert [Sat, 24 Jan 2015 21:15:40 +0000 (22:15 +0100)]
Merge pull request #2116 from rubenk/recursor-fixes

Recursor fixes

9 years agoAs noted by Fusl, the new DoS measures kill our daemon in case the root refresh query...
bert hubert [Sat, 24 Jan 2015 20:07:58 +0000 (21:07 +0100)]
As noted by Fusl, the new DoS measures kill our daemon in case the root refresh query times out.

9 years agoFix PIE detection for older gcc's
Ruben Kerkhof [Sat, 24 Jan 2015 17:47:23 +0000 (18:47 +0100)]
Fix PIE detection for older gcc's

At least on FreeBSD, gcc42 can't create
position-independent executables when threads are involved.

Expand our configure check to use some pthread code so it fails
instead of succeeds.

Fixes #2037 and probably #2055

9 years agoDo not compile with -fPIC if we compile with -fPIE
Ruben Kerkhof [Sat, 24 Jan 2015 17:12:41 +0000 (18:12 +0100)]
Do not compile with -fPIC if we compile with -fPIE

9 years agoOnly compile PIE objects if we can link them
Ruben Kerkhof [Sat, 24 Jan 2015 17:11:57 +0000 (18:11 +0100)]
Only compile PIE objects if we can link them

9 years agoMove comment down
Ruben Kerkhof [Sat, 24 Jan 2015 17:08:50 +0000 (18:08 +0100)]
Move comment down

9 years agoRemove a.out and a2.out at the end of the function
Ruben Kerkhof [Sat, 24 Jan 2015 16:58:18 +0000 (17:58 +0100)]
Remove a.out and a2.out at the end of the function

9 years agoNo need to export variables
Ruben Kerkhof [Sat, 24 Jan 2015 16:53:11 +0000 (17:53 +0100)]
No need to export variables

We're not using these variables in any child processes

9 years ago7 seconds works better as max time waiting for a domain..
bert hubert [Sat, 24 Jan 2015 12:58:11 +0000 (13:58 +0100)]
7 seconds works better as max time waiting for a domain..

9 years agospeedtest needs -lrt on some platforms
bert hubert [Sat, 24 Jan 2015 12:57:37 +0000 (13:57 +0100)]
speedtest needs -lrt on some platforms

9 years agoadd some more microbenchmarks, move speedtest to CPUTime instead of wallclock
bert hubert [Sat, 24 Jan 2015 12:45:28 +0000 (13:45 +0100)]
add some more microbenchmarks, move speedtest to CPUTime instead of wallclock

9 years agoMerge pull request #2112 from rubenk/reduce-nr-of-shell-invocations-in-recursor
Peter van Dijk [Fri, 23 Jan 2015 11:19:10 +0000 (12:19 +0100)]
Merge pull request #2112 from rubenk/reduce-nr-of-shell-invocations-in-recursor

Reduce number of shell invocations in recursor

9 years agoMerge pull request #2110 from mind04/label
Peter van Dijk [Fri, 23 Jan 2015 11:16:50 +0000 (12:16 +0100)]
Merge pull request #2110 from mind04/label

check label and name length in xfrLabel()

9 years agoMerge pull request #2102 from pieterlexis/issue-2058-Fix-Anchors
Peter van Dijk [Fri, 23 Jan 2015 09:33:04 +0000 (10:33 +0100)]
Merge pull request #2102 from pieterlexis/issue-2058-Fix-Anchors

Fix anchors in docs and add a check possibility

9 years agoMerge pull request #2089 from pieterlexis/issue-2085-Document-pdns_control-commands
Peter van Dijk [Thu, 22 Jan 2015 17:17:18 +0000 (18:17 +0100)]
Merge pull request #2089 from pieterlexis/issue-2085-Document-pdns_control-commands

Document missing options in pdns_control.1

9 years agoHave travis check the links in the docs
Pieter Lexis [Tue, 20 Jan 2015 17:11:12 +0000 (18:11 +0100)]
Have travis check the links in the docs

9 years agoAdd optional linkchecker for documentation
Pieter Lexis [Tue, 20 Jan 2015 07:10:35 +0000 (08:10 +0100)]
Add optional linkchecker for documentation

   * This allows all internal links (including anchors) in the
   documentation to be verified.

9 years agoFix all internal links (also for anchors)
Pieter Lexis [Mon, 19 Jan 2015 17:28:43 +0000 (18:28 +0100)]
Fix all internal links (also for anchors)

 * Closes #2058

9 years agoimprove error message for 'too much time spent'
bert hubert [Thu, 22 Jan 2015 16:00:49 +0000 (17:00 +0100)]
improve error message for 'too much time spent'

9 years agoupdate the clock because we now make decisions on absolutely correct times
bert hubert [Thu, 22 Jan 2015 15:56:21 +0000 (16:56 +0100)]
update the clock because we now make decisions on absolutely correct times

9 years agoReduce number of shell invocations in recursor
Ruben Kerkhof [Thu, 22 Jan 2015 15:07:31 +0000 (16:07 +0100)]
Reduce number of shell invocations in recursor

6e4dfa7e39 fixed this for auth, but we forgot to do this for the
recursor.

9 years agoMerge pull request #2109 from mind04/yahttp
Peter van Dijk [Thu, 22 Jan 2015 14:05:00 +0000 (15:05 +0100)]
Merge pull request #2109 from mind04/yahttp

remove debug output in yahttp reqresp.hpp

9 years agoweird..
bert hubert [Thu, 22 Jan 2015 12:56:25 +0000 (13:56 +0100)]
weird..

9 years agowe attempted to store string versions of addresses in comboaddress based ringbuffer...
bert hubert [Thu, 22 Jan 2015 12:02:35 +0000 (13:02 +0100)]
we attempted to store string versions of addresses in comboaddress based ringbuffer for corrupt queries

9 years agowhitespace + better error message for ringbuffer error
bert hubert [Thu, 22 Jan 2015 11:57:52 +0000 (12:57 +0100)]
whitespace + better error message for ringbuffer error

9 years agoand update soa serial for secpoll.zone
bert hubert [Thu, 22 Jan 2015 11:54:39 +0000 (12:54 +0100)]
and update soa serial for secpoll.zone

9 years agoChangelog for 3.7.0-RC1, plus add mechanics for autoreplacing git hashes with github...
bert hubert [Thu, 22 Jan 2015 11:50:42 +0000 (12:50 +0100)]
Changelog for 3.7.0-RC1, plus add mechanics for autoreplacing git hashes with github links in changelog.md.raw.

9 years agoI know, a kitten dies every time I do this. Merge branch 'master' of github.com:Power...
bert hubert [Thu, 22 Jan 2015 10:26:09 +0000 (11:26 +0100)]
I know, a kitten dies every time I do this. Merge branch 'master' of github.com:PowerDNS/pdns

9 years agomake sure pdnssec emits error messages about inability to load a backend, and not...
bert hubert [Thu, 22 Jan 2015 10:25:44 +0000 (11:25 +0100)]
make sure pdnssec emits error messages about inability to load a backend, and not die silently

9 years agoour logger is now so lockfree the output became hella ugly on console output, tweaked...
bert hubert [Thu, 22 Jan 2015 10:16:35 +0000 (11:16 +0100)]
our logger is now so lockfree the output became hella ugly on console output, tweaked it a bit

9 years agoadd 3.7.0-rc1 to zone
bert hubert [Thu, 22 Jan 2015 09:53:20 +0000 (10:53 +0100)]
add 3.7.0-rc1 to zone

9 years agotests for label and name length check in xfrLabel()
Kees Monshouwer [Wed, 21 Jan 2015 10:26:45 +0000 (11:26 +0100)]
tests for label and name length check in xfrLabel()

9 years agocheck label and name length in xfrLabel()
Kees Monshouwer [Wed, 21 Jan 2015 10:26:33 +0000 (11:26 +0100)]
check label and name length in xfrLabel()

9 years agomore docs rec-3.7.0-rc1
bert hubert [Wed, 21 Jan 2015 15:09:46 +0000 (16:09 +0100)]
more docs

9 years agoremove debug output in yahttp reqresp.hpp
Kees Monshouwer [Wed, 21 Jan 2015 11:34:29 +0000 (12:34 +0100)]
remove debug output in yahttp reqresp.hpp

9 years agoimplement max-tot-msec wallclock time limit per query (needs docs)
bert hubert [Wed, 21 Jan 2015 11:21:38 +0000 (12:21 +0100)]
implement max-tot-msec wallclock time limit per query (needs docs)

9 years agofix up documentation error for ipfilter
bert hubert [Wed, 21 Jan 2015 11:21:03 +0000 (12:21 +0100)]
fix up documentation error for ipfilter

9 years agoadd ipfilter() lua hook, document it and also preoutquery. Cache which lua functions...
bert hubert [Tue, 20 Jan 2015 21:03:31 +0000 (22:03 +0100)]
add ipfilter() lua hook, document it and also preoutquery. Cache which lua functions are defined, shaving a few microseconds per undefined hook. Feed preoutquery the address of the original requestor, which might then be added to an ipset for use by ipfilter. Update our example scripts.

9 years agoretune loglevels for quiet=no query logging but also make sure we print those lines...
bert hubert [Tue, 20 Jan 2015 20:01:32 +0000 (21:01 +0100)]
retune loglevels for quiet=no query logging but also make sure we print those lines with quiet=no

9 years agomake printing of netmasks and netmask groups from lua a bit easier
bert hubert [Tue, 20 Jan 2015 19:56:24 +0000 (20:56 +0100)]
make printing of netmasks and netmask groups from lua a bit easier

9 years agoMerge pull request #2077 from mind04/secpoll
Peter van Dijk [Tue, 20 Jan 2015 13:53:30 +0000 (14:53 +0100)]
Merge pull request #2077 from mind04/secpoll

limit long version strings to 63 characters and catch exceptions in secpoll

9 years agolua iputils ipset was accidentally port number sensitive. it is not an ipportset.
bert hubert [Tue, 20 Jan 2015 09:20:03 +0000 (10:20 +0100)]
lua iputils ipset was accidentally port number sensitive. it is not an ipportset.

9 years agoMerge pull request #2101 from cmouse/yahttp-upgrade-0.1.5
Peter van Dijk [Tue, 20 Jan 2015 08:59:29 +0000 (09:59 +0100)]
Merge pull request #2101 from cmouse/yahttp-upgrade-0.1.5

Upgrade YaHTTP to 0.1.5

9 years agoUpgrade to 0.1.5
Aki Tuomi [Mon, 19 Jan 2015 20:28:41 +0000 (22:28 +0200)]
Upgrade to 0.1.5

9 years agoEnable botan in Travis
Ruben Kerkhof [Sun, 4 Jan 2015 19:39:57 +0000 (20:39 +0100)]
Enable botan in Travis

9 years agotone down loglevels for some things that aren't warnings or should be behind log...
bert hubert [Mon, 19 Jan 2015 09:34:02 +0000 (10:34 +0100)]
tone down loglevels for some things that aren't warnings or should be behind log-common-errors

9 years agoMerge pull request #2097 from mind04/lua53-1
Peter van Dijk [Mon, 19 Jan 2015 09:24:49 +0000 (10:24 +0100)]
Merge pull request #2097 from mind04/lua53-1

use luaL_checkinteger for Lua 5.3

9 years agouse luaL_checkinteger for Lua 5.3
Kees Monshouwer [Mon, 19 Jan 2015 09:18:53 +0000 (10:18 +0100)]
use luaL_checkinteger for Lua 5.3

9 years agoMerge pull request #2096 from mind04/lua53
Peter van Dijk [Mon, 19 Jan 2015 08:45:24 +0000 (09:45 +0100)]
Merge pull request #2096 from mind04/lua53

Lua 5.3 in recursor testbuild spec

9 years agoLua 5.3 in recursor testbuild spec
Kees Monshouwer [Mon, 19 Jan 2015 08:42:34 +0000 (09:42 +0100)]
Lua 5.3 in recursor testbuild spec

9 years agoMerge pull request #2091 from rubenk/let-pkgconfig-determine-botan-deps
Peter van Dijk [Mon, 19 Jan 2015 07:59:45 +0000 (08:59 +0100)]
Merge pull request #2091 from rubenk/let-pkgconfig-determine-botan-deps

Let pkg-config determine botan dependency libs

9 years agoMerge pull request #2094 from zeha/f/fix-stale-tx
Peter van Dijk [Mon, 19 Jan 2015 07:54:44 +0000 (08:54 +0100)]
Merge pull request #2094 from zeha/f/fix-stale-tx

Auth API: fix missing abortTransaction() in error case

9 years agonit
Peter van Dijk [Mon, 19 Jan 2015 07:54:28 +0000 (08:54 +0100)]
nit

9 years agoAuth API: fix missing abortTransaction() in error case
Christian Hofstaedtler [Sun, 18 Jan 2015 17:42:16 +0000 (18:42 +0100)]
Auth API: fix missing abortTransaction() in error case

Noticed by Aki Tuomi.

9 years agoLet pkg-config determine botan dependency libs
Ruben Kerkhof [Fri, 16 Jan 2015 12:14:43 +0000 (13:14 +0100)]
Let pkg-config determine botan dependency libs

9 years agothis should fix it really
bert hubert [Fri, 16 Jan 2015 15:26:31 +0000 (16:26 +0100)]
this should fix it really

9 years agomissed pthread in 2 places
bert hubert [Fri, 16 Jan 2015 15:17:59 +0000 (16:17 +0100)]
missed pthread in 2 places

9 years agologger.cc now needs -pthread
bert hubert [Fri, 16 Jan 2015 15:12:54 +0000 (16:12 +0100)]
logger.cc now needs -pthread

9 years agofix up compilation wrt unixDie
bert hubert [Fri, 16 Jan 2015 14:46:25 +0000 (15:46 +0100)]
fix up compilation wrt unixDie

9 years agoMerge branch 'master' of github.com:PowerDNS/pdns
bert hubert [Fri, 16 Jan 2015 14:30:07 +0000 (15:30 +0100)]
Merge branch 'master' of github.com:PowerDNS/pdns

9 years agoremove the lock from our Logger class and replace it by thread specific storage of...
bert hubert [Fri, 16 Jan 2015 14:29:34 +0000 (15:29 +0100)]
remove the lock from our Logger class and replace it by thread specific storage of the log line being constructed

9 years agoDocument missing options in pdns_control.1
Pieter Lexis [Fri, 16 Jan 2015 09:02:40 +0000 (10:02 +0100)]
Document missing options in pdns_control.1

  * Closes #2085
  * Ports changes (in the original manpages) from the following commits:
   * 64e4dc71
   * a5d2ead5

9 years agoMerge pull request #2082 from rubenk/only-build-zone2ldap-when-building-ldapbackend
Peter van Dijk [Fri, 16 Jan 2015 08:54:00 +0000 (09:54 +0100)]
Merge pull request #2082 from rubenk/only-build-zone2ldap-when-building-ldapbackend

Only build zone2ldap when we build ldapbackend

9 years agoOnly build zone2ldap when we build ldapbackend
Ruben Kerkhof [Tue, 13 Jan 2015 20:06:05 +0000 (21:06 +0100)]
Only build zone2ldap when we build ldapbackend

9 years agoMerge pull request #2087 from nivex/patch-2
Peter van Dijk [Fri, 16 Jan 2015 07:01:27 +0000 (08:01 +0100)]
Merge pull request #2087 from nivex/patch-2

Fix reference to wrong zone2sql dialect

9 years ago'Aiden880' discovered a link missed http://
bert hubert [Thu, 15 Jan 2015 19:10:54 +0000 (20:10 +0100)]
'Aiden880' discovered a link missed http://

9 years agoFix reference to wrong zone2sql dialect
Kevin Otte [Thu, 15 Jan 2015 16:22:49 +0000 (11:22 -0500)]
Fix reference to wrong zone2sql dialect

9 years agoMerge pull request #2086 from cmouse/httpconnector-errors
Peter van Dijk [Thu, 15 Jan 2015 13:50:11 +0000 (14:50 +0100)]
Merge pull request #2086 from cmouse/httpconnector-errors

Properly handle read errors (EOF and errors)

9 years agoremove old tsc based timer infrastructure, beef up #ifdef to prevent using the high...
bert hubert [Thu, 15 Jan 2015 12:43:28 +0000 (13:43 +0100)]
remove old tsc based timer infrastructure, beef up #ifdef to prevent using the high-end per thread cpu timers on OSX

9 years agoadd some timing infra which is disabled by default, turn it on with -DMTASKERTIMING
bert hubert [Thu, 15 Jan 2015 12:35:11 +0000 (13:35 +0100)]
add some timing infra which is disabled by default, turn it on with -DMTASKERTIMING

9 years agoadd CPU time nanosecond resolution infrastructure, behind #ifdef now for supporting...
bert hubert [Thu, 15 Jan 2015 12:24:08 +0000 (13:24 +0100)]
add CPU time nanosecond resolution infrastructure, behind #ifdef now for supporting systems

9 years agoshave a whole bunch of replace_all calls & resulting allocations
bert hubert [Thu, 15 Jan 2015 12:08:16 +0000 (13:08 +0100)]
shave a whole bunch of replace_all calls & resulting allocations

9 years agowe actually deliver MTasker timeouts with the wrong d_tid set. Unknown if this matter...
bert hubert [Thu, 15 Jan 2015 11:50:10 +0000 (12:50 +0100)]
we actually deliver MTasker timeouts with the wrong d_tid set. Unknown if this matters anywhere, but it was wrong in any case.

9 years agoMerge branch 'master' of github.com:PowerDNS/pdns
bert hubert [Thu, 15 Jan 2015 09:21:51 +0000 (10:21 +0100)]
Merge branch 'master' of github.com:PowerDNS/pdns