git.ipfire.org Git - thirdparty/knot-resolver.git/commit

]> git.ipfire.org Git - thirdparty/knot-resolver.git/commit

projects / thirdparty / knot-resolver.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: c65cc3c eed008a)

author	Vladimír Čunát <vladimir.cunat@nic.cz>
	Mon, 30 Sep 2024 13:34:11 +0000 (15:34 +0200)
committer	Vladimír Čunát <vladimir.cunat@nic.cz>
	Mon, 30 Sep 2024 13:34:11 +0000 (15:34 +0200)
commit	3b815e8f6989d64ce1facaa24dd0f94c585b819d
tree	48943e52d37bdb89b313dc6ba5320eb7c19ef140	tree \| snapshot
parent	c65cc3ca78e07c314b7614e9b76d0ef6a4f44620	commit \| diff
parent	eed008a0bf43eece23b86e502bee183db42033fa	commit \| diff

Merge branch 'master' into rrl-wip

17 files changed:

.gitlab-ci.yml	diff1 \|	diff2 \|	blob \| history
daemon/lua/kres-gen-33.lua	diff1 \|	diff2 \|	blob \| history
daemon/lua/kres-gen.sh	diff1 \|	diff2 \|	blob \| history
daemon/main.c	diff1 \|	diff2 \|	blob \| history
daemon/proxyv2.c	diff1 \|	diff2 \|	blob \| history
daemon/session2.c	diff1 \|	diff2 \|	blob \| history
daemon/session2.h	diff1 \|	diff2 \|	blob \| history
daemon/worker.c	diff1 \|	diff2 \|	blob \| history
lib/utils.c	diff1 \|	diff2 \|	blob \| history
lib/utils.h	diff1 \|	diff2 \|	blob \| history
meson.build	diff1 \|	diff2 \|	blob \| history
modules/policy/policy.lua	diff1 \|	diff2 \|	blob \| history
python/knot_resolver/datamodel/config_schema.py	diff1 \|	diff2 \|	blob \| history
python/knot_resolver/datamodel/rate_limiting_schema.py	diff1 \|	\|	blob \| history
python/knot_resolver/datamodel/templates/rate_limiting.lua.j2	diff1 \|	\|	blob \| history
python/knot_resolver/datamodel/templates/worker-config.lua.j2	diff1 \|	diff2 \|	blob \| history
python/knot_resolver/manager/manager.py	diff1 \|	diff2 \|	blob \| history

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