]> git.ipfire.org Git - thirdparty/knot-resolver.git/commitdiff
Merge branch 'max-resolve-time' into 'master'
authorPetr Špaček <petr.spacek@nic.cz>
Mon, 11 Sep 2017 10:55:54 +0000 (12:55 +0200)
committerPetr Špaček <petr.spacek@nic.cz>
Mon, 11 Sep 2017 10:55:54 +0000 (12:55 +0200)
Limit maximal resolution time

Closes #241

See merge request !368


Trivial merge