Merge branch 'master' into zone-events-queue
Conflicts: src/knot/dnssec/zone-sign.c src/knot/nameserver/axfr.c src/knot/nameserver/internet.c src/knot/nameserver/notify.c src/knot/nameserver/nsec_proofs.c src/knot/server/xfr-handler.c src/knot/server/zone-load.c src/knot/server/zones.c src/knot/updates/ddns.c src/knot/updates/xfr-in.c src/knot/zone/contents.c src/knot/zone/contents.h src/knot/zone/semantic-check.c src/knot/zone/semantic-check.h src/knot/zone/zone-diff.c src/knot/zone/zonefile.c tests/process_query.c
No related branches found
No related tags found
Showing
- .gitignore 4 additions, 0 deletions.gitignore
- Makefile.am 4 additions, 2 deletionsMakefile.am
- configure.ac 12 additions, 1 deletionconfigure.ac
- doc/Makefile.am 1 addition, 0 deletionsdoc/Makefile.am
- doc/installation.texi 1 addition, 1 deletiondoc/installation.texi
- doc/running.texi 0 additions, 1 deletiondoc/running.texi
- m4/code-coverage.m4 3 additions, 2 deletionsm4/code-coverage.m4
- man/knotd.8.in 0 additions, 3 deletionsman/knotd.8.in
- src/Makefile.am 2 additions, 2 deletionssrc/Makefile.am
- src/knot/ctl/knotc_main.c 14 additions, 16 deletionssrc/knot/ctl/knotc_main.c
- src/knot/ctl/remote.c 4 additions, 4 deletionssrc/knot/ctl/remote.c
- src/knot/dnssec/nsec-chain.c 18 additions, 18 deletionssrc/knot/dnssec/nsec-chain.c
- src/knot/dnssec/nsec-chain.h 5 additions, 5 deletionssrc/knot/dnssec/nsec-chain.h
- src/knot/dnssec/nsec3-chain.c 44 additions, 43 deletionssrc/knot/dnssec/nsec3-chain.c
- src/knot/dnssec/zone-events.c 4 additions, 4 deletionssrc/knot/dnssec/zone-events.c
- src/knot/dnssec/zone-nsec.c 4 additions, 4 deletionssrc/knot/dnssec/zone-nsec.c
- src/knot/dnssec/zone-sign.c 27 additions, 27 deletionssrc/knot/dnssec/zone-sign.c
- src/knot/dnssec/zone-sign.h 1 addition, 1 deletionsrc/knot/dnssec/zone-sign.h
- src/knot/main.c 1 addition, 7 deletionssrc/knot/main.c
- src/knot/nameserver/axfr.c 6 additions, 6 deletionssrc/knot/nameserver/axfr.c
Loading
Please register or sign in to comment