]> git.ipfire.org Git - thirdparty/knot-resolver.git/commitdiff
projects / thirdparty / knot-resolver.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6d209ef f343404)
Merge branch 'multiple-config-files' into 'master' obs-knot-dns-deve-jq0xxt/deployments/465 obs-knot-resolver-es11k1/deployments/466
authorPetr Špaček <petr.spacek@nic.cz>
Thu, 19 Dec 2019 09:06:29 +0000 (10:06 +0100)
committerPetr Špaček <petr.spacek@nic.cz>
Thu, 19 Dec 2019 09:06:29 +0000 (10:06 +0100)
daemon/main: support multiple config files

See merge request knot/knot-resolver!909


Trivial merge
Mirror of https://gitlab.nic.cz/knot/knot-resolver.git