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: 713ba54 b6bc706)

author	Oto Šťáva <oto.stava@nic.cz>
	Thu, 22 Jun 2023 07:43:18 +0000 (09:43 +0200)
committer	Oto Šťáva <oto.stava@nic.cz>
	Thu, 22 Jun 2023 07:52:42 +0000 (09:52 +0200)
commit	892fb5fd2a38ad633b73fd93204cb4a1f01a66cc
tree	9dd9c0b38fa7bdd148ff0f3359fdd17658889696	tree
parent	713ba54783a650a9100756a43e29f94a62fd0306	commit \| diff
parent	b6bc7062ce36463a490dc403c37735c96630c907	commit \| diff

Merge remote-tracking branch 'origin/6.0' into daemon-refactor-2

13 files changed:

.gitlab-ci.yml	diff1 \|	diff2 \|	blob \| history
daemon/bindings/cache.c	diff1 \|	diff2 \|	blob \| history
daemon/bindings/net.c	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
daemon/lua/kres-gen.sh	diff1 \|	diff2 \|	blob \| history
daemon/main.c	diff1 \|	diff2 \|	blob \| history
lib/log.c	diff1 \|	diff2 \|	blob \| history
lib/log.h	diff1 \|	diff2 \|	blob \| history
lib/resolve.c	diff1 \|	diff2 \|	blob \| history
lib/resolve.h	diff1 \|	diff2 \|	blob \| history
modules/hints/hints.c	diff1 \|	diff2 \|	blob \| history

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