Skip to content
Blame Permalink
  • Lubos Slovak's avatar
    3cb706f7
    Merge branch 'resolver_compat' into public-libs · 3cb706f7
    Lubos Slovak authored 
    Conflicts:
	src/knot/nameserver/ixfr.c
	src/knot/nameserver/process_answer.c
	src/knot/nameserver/process_query.c
	src/knot/server/tcp-handler.c
	src/knot/zone/events/handlers.c
	src/libknot/dname.c
	src/libknot/processing/requestor.c
	src/libknot/rrtype/tsig.c
    3cb706f7
    Merge branch 'resolver_compat' into public-libs
    Lubos Slovak authored 
    Conflicts:
	src/knot/nameserver/ixfr.c
	src/knot/nameserver/process_answer.c
	src/knot/nameserver/process_query.c
	src/knot/server/tcp-handler.c
	src/knot/zone/events/handlers.c
	src/libknot/dname.c
	src/libknot/processing/requestor.c
	src/libknot/rrtype/tsig.c