]> git.ipfire.org Git - thirdparty/knot-resolver.git/commit
Merge 'origin/master' into 6.0 - last merge before rename docs-develop-6-0-mvwoqi/deployments/4073 docs-develop-cove-uiak3c/deployments/4076 docs-develop-mast-tzgd0f/deployments/4075 docs-develop-mast-tzgd0f/deployments/4079 docs-develop-mast-tzgd0f/deployments/4082 docs-develop-nigh-589znp/deployments/4080 docs-develop-tmp-wti7ta/deployments/4072 obs-knot-resolver-es11k1/deployments/4081
authorOto Šťáva <oto.stava@nic.cz>
Tue, 14 May 2024 10:05:01 +0000 (12:05 +0200)
committerOto Šťáva <oto.stava@nic.cz>
Tue, 14 May 2024 10:05:01 +0000 (12:05 +0200)
commit2905edac512ebe123fc445e8f20e3bc82ce6c9df
tree8538f086c902b1e975607a2ec49f4a11a246cb09
parent3cafb904446c9d8d81387c113c39dc5a596a3a1d
parent1080b61e4e73014382902c8d9bb321cb6af3a361
Merge 'origin/master' into 6.0 - last merge before rename

This is the last commit in `6.0` before it is shifted into `master`,
with 5.x support being moved to `master-5`.
21 files changed:
.gitignore
.gitlab-ci.yml
daemon/bindings/net.c
daemon/engine.c
daemon/io.c
daemon/main.c
daemon/proxyv2.c
daemon/tls.c
daemon/tls.h
daemon/tls_ephemeral_credentials.c
daemon/udp_queue.c
daemon/worker.c
daemon/zimport.c
lib/cache/peek.c
lib/dnssec.c
lib/log.c
lib/resolve.c
lib/selection.c
modules/dnstap/dnstap.c
modules/stats/stats.c
utils/cache_gc/db.c