]> 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: 6b4382b d24cd44)
Merge branch 'ta-multiple' into 'master'
authorOndřej Surý <ondrej.sury@nic.cz>
Fri, 10 Feb 2017 07:58:36 +0000 (08:58 +0100)
committerOndřej Surý <ondrej.sury@nic.cz>
Fri, 10 Feb 2017 07:58:36 +0000 (08:58 +0100)
trust anchor fixes

Closes #151

See merge request !193

1  2 
daemon/daemon.mk patch | diff1 | diff2 | blob | history
daemon/lua/sandbox.lua patch | diff1 | diff2 | blob | history

diff --cc daemon/daemon.mk
Simple merge
diff --cc daemon/lua/sandbox.lua
Simple merge
Mirror of https://gitlab.nic.cz/knot/knot-resolver.git