Merge branch 'master' into resolver_compat
Conflicts: Knot.files src/Makefile.am src/knot/conf/conf.h src/knot/nameserver/process_answer.c src/knot/zone/events/handlers.c
No related branches found
No related tags found
Showing
- Knot.files 23 additions, 7 deletionsKnot.files
- NEWS 20 additions, 0 deletionsNEWS
- configure.ac 6 additions, 1 deletionconfigure.ac
- doc/running.rst 1 addition, 2 deletionsdoc/running.rst
- m4/code-coverage.m4 1 addition, 1 deletionm4/code-coverage.m4
- m4/knot-check-header.m4 49 additions, 0 deletionsm4/knot-check-header.m4
- man/knotc.8.in 4 additions, 7 deletionsman/knotc.8.in
- src/Makefile.am 20 additions, 6 deletionssrc/Makefile.am
- src/common/log.c 1 addition, 1 deletionsrc/common/log.c
- src/common/namedb/namedb.h 68 additions, 0 deletionssrc/common/namedb/namedb.h
- src/common/namedb/namedb_lmdb.c 315 additions, 0 deletionssrc/common/namedb/namedb_lmdb.c
- src/common/namedb/namedb_lmdb.h 21 additions, 0 deletionssrc/common/namedb/namedb_lmdb.h
- src/common/namedb/namedb_trie.c 140 additions, 0 deletionssrc/common/namedb/namedb_trie.c
- src/common/namedb/namedb_trie.h 21 additions, 0 deletionssrc/common/namedb/namedb_trie.h
- src/knot/conf/cf-parse.y 4 additions, 4 deletionssrc/knot/conf/cf-parse.y
- src/knot/conf/conf.c 13 additions, 1 deletionsrc/knot/conf/conf.c
- src/knot/conf/conf.h 6 additions, 0 deletionssrc/knot/conf/conf.h
- src/knot/ctl/knotc_main.c 6 additions, 12 deletionssrc/knot/ctl/knotc_main.c
- src/knot/ctl/remote.c 81 additions, 36 deletionssrc/knot/ctl/remote.c
- src/knot/dnssec/nsec3-chain.c 2 additions, 2 deletionssrc/knot/dnssec/nsec3-chain.c
Loading
Please register or sign in to comment