Merge branch 'master' into public-libs-common
Conflicts: Knot.files src/Makefile.am src/knot/conf/conf.c src/knot/ctl/estimator.c src/knot/ctl/knotc_main.c src/knot/ctl/remote.c src/knot/dnssec/nsec3-chain.c src/knot/dnssec/zone-keys.c src/knot/dnssec/zone-sign.c src/knot/nameserver/nsec_proofs.c src/knot/nameserver/process_query.c src/knot/nameserver/update.c src/knot/server/server.h src/knot/server/tcp-handler.c src/knot/server/udp-handler.c src/knot/updates/apply.c src/knot/zone/contents.c src/knot/zone/events/handlers.c src/knot/zone/timers.c src/knot/zone/zone-tree.c src/knot/zone/zonedb.c src/knot/zone/zonefile.c src/libknot/binary.c src/libknot/dname.c src/libknot/dnssec/key.c src/libknot/errcode.c src/libknot/internal/log.c src/libknot/internal/mempattern.c src/libknot/internal/net.c src/libknot/internal/tolower.c src/libknot/internal/trie/hat-trie.h src/libknot/internal/utils.c src/libknot/packet/compr.c src/libknot/packet/pkt.c src/libknot/processing/layer.c src/libknot/processing/requestor.c src/libknot/rrset-dump.c src/libknot/rrset.c src/libknot/rrtype/nsec3param.c src/libknot/rrtype/opt.c src/libknot/rrtype/tsig.c src/libknot/tsig-op.c src/utils/nsupdate/nsupdate_exec.c tests/hhash.c tests/namedb.c tests/zone_timers.c tests/zone_update.c
No related branches found
No related tags found
Showing
- Knot.files 42 additions, 42 deletionsKnot.files
- NEWS 35 additions, 2 deletionsNEWS
- README 5 additions, 3 deletionsREADME
- configure.ac 1 addition, 1 deletionconfigure.ac
- doc/configuration.rst 9 additions, 3 deletionsdoc/configuration.rst
- doc/installation.rst 17 additions, 5 deletionsdoc/installation.rst
- doc/introduction.rst 1 addition, 0 deletionsdoc/introduction.rst
- doc/reference.rst 7 additions, 2 deletionsdoc/reference.rst
- doc/requirements.rst 1 addition, 1 deletiondoc/requirements.rst
- src/Makefile.am 3 additions, 2 deletionssrc/Makefile.am
- src/common-knot/fdset.c 1 addition, 1 deletionsrc/common-knot/fdset.c
- src/dnstap/reader.c 1 addition, 2 deletionssrc/dnstap/reader.c
- src/dnstap/writer.c 0 additions, 1 deletionsrc/dnstap/writer.c
- src/knot/conf/conf.c 5 additions, 16 deletionssrc/knot/conf/conf.c
- src/knot/conf/conf.h 0 additions, 6 deletionssrc/knot/conf/conf.h
- src/knot/ctl/estimator.c 2 additions, 1 deletionsrc/knot/ctl/estimator.c
- src/knot/ctl/knotc_main.c 22 additions, 21 deletionssrc/knot/ctl/knotc_main.c
- src/knot/ctl/remote.c 6 additions, 5 deletionssrc/knot/ctl/remote.c
- src/knot/dnssec/nsec-chain.c 14 additions, 2 deletionssrc/knot/dnssec/nsec-chain.c
- src/knot/dnssec/nsec3-chain.c 4 additions, 4 deletionssrc/knot/dnssec/nsec3-chain.c
Loading
Please register or sign in to comment