]> git.ipfire.org Git - thirdparty/knot-resolver.git/commit
projects / thirdparty / knot-resolver.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 4410e10 e20df08)
Merge branch 'master' into dos-feb13-6.0 docs-develop-dos-hama3x/deployments/3237
authorVladimír Čunát <vladimir.cunat@nic.cz>
Tue, 13 Feb 2024 12:12:41 +0000 (13:12 +0100)
committerVladimír Čunát <vladimir.cunat@nic.cz>
Tue, 13 Feb 2024 12:19:47 +0000 (13:19 +0100)
commitfb08513c3cd96186d35ca3f591c111423fd6fe23
tree31065fdf1096473d1c6d349d7bc6b2d087ab088ctree
parent4410e100833d31e0033b727c38aa1772deef8e5fcommit | diff
parente20df08838e8be82c5fd243026c1cbda7a63e9d0commit | diff
Merge branch 'master' into dos-feb13-6.0

There were some nontrivial conflicts to resolve, NEWS + the line
    ctx->vld_limit_crypto = KR_VLD_LIMIT_CRYPTO_DEFAULT;
(I had this resolution prepared for a long time.)
NEWS diff1 | diff2 | blob | history
daemon/lua/kres-gen-30.lua diff1 | diff2 | blob | history
daemon/lua/kres-gen-31.lua diff1 | diff2 | blob | history
daemon/lua/kres-gen-32.lua diff1 | diff2 | blob | history
lib/cache/api.c diff1 | diff2 | blob | history
lib/resolve.c diff1 | diff2 | blob | history
lib/resolve.h diff1 | diff2 | blob | history
lib/rplan.h diff1 | diff2 | blob | history
Mirror of https://gitlab.nic.cz/knot/knot-resolver.git