Skip to content
Snippets Groups Projects
Commit a81a26ce authored by Jan Kadlec's avatar Jan Kadlec
Browse files

Merge branch 'master' into rr_refactor 

Conflicts:
	src/knot/dnssec/nsec-chain.c
	src/knot/dnssec/nsec3-chain.c
	src/knot/nameserver/name-server.c
	src/knot/nameserver/nsec_proofs.c
	src/knot/updates/ddns.c
	src/knot/updates/xfr-in.c
	src/knot/zone/node.c
	src/knot/zone/zone-diff.c
	src/knot/zone/zone-dump.c
	src/knot/zone/zone-load.c
	src/knot/zone/zone-load.h
parents fe01b062 1e75046f
No related branches found
No related tags found
1 merge request!174RRSet refactoring - remove RRSIGs, custom memory allocator
Hide whitespace changes
Inline Side-by-side
Showing
with 315 additions and 1279 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment