Skip to content
Snippets Groups Projects
Commit 4ffdcaae authored by Marek Vavrusa's avatar Marek Vavrusa
Browse files

Merge branch 'missing-tests' into development

Conflicts:
	Knot.files
	src/dnslib/debug.c
	src/dnslib/debug.h
	src/dnslib/dname-table.c
	src/dnslib/dname-table.h
	src/dnslib/hash/cuckoo-hash-table.c
	src/dnslib/hash/cuckoo-hash-table.h
	src/dnslib/node.c
	src/dnslib/node.h
	src/dnslib/tests/dnslib/zone_tests.c
	src/dnslib/zone-dump.c
	src/dnslib/zone-load.c
	src/dnslib/zone-tree.c
	src/dnslib/zone-tree.h
	src/dnslib/zone.c
	src/dnslib/zone.h
	src/knot/conf/cf-parse.y
	src/knot/server/journal.c
	src/knot/server/name-server.c
	src/knot/server/xfr-handler.c
	src/knot/server/xfr-handler.h
	src/knot/server/xfr-in.c
	src/knot/server/zones.c
	src/knot/server/zones.h
parents b60288ca d2d0c07f
No related branches found
No related tags found
No related merge requests found
Showing
with 1433 additions and 51 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment