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: be87bc8 aa60066)

author	Lukáš Ondráček <lukas.ondracek@nic.cz>
	Tue, 30 Jul 2024 15:05:47 +0000 (17:05 +0200)
committer	Lukáš Ondráček <lukas.ondracek@nic.cz>
	Tue, 30 Jul 2024 15:05:47 +0000 (17:05 +0200)
commit	6834751d0f1e943d4b0db19a86f52fe45d9a9105
tree	e2a4f4b6644dceb521e29b3af804c4596e81b676	tree
parent	be87bc83b5f07ee64582ca8524db17d82f9f052d	commit \| diff
parent	aa60066cbf321fd187ebb3f046c9f73476308d4b	commit \| diff

Merge branch 'master' into rrl-wip

14 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/proxyv2.h	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
manager/knot_resolver_manager/datamodel/config_schema.py	diff1 \|	diff2 \|	blob \| history
manager/knot_resolver_manager/datamodel/templates/worker-config.lua.j2	diff1 \|	diff2 \|	blob \| history
manager/knot_resolver_manager/kres_manager.py	diff1 \|	diff2 \|	blob \| history
meson.build	diff1 \|	diff2 \|	blob \| history

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