Merge branch 'master' into ext-rcode
Conflicts: src/knot/nameserver/process_query.c
Showing
- Knot.files 91 additions, 87 deletionsKnot.files
- NEWS 21 additions, 1 deletionNEWS
- configure.ac 3 additions, 3 deletionsconfigure.ac
- src/Makefile.am 64 additions, 61 deletionssrc/Makefile.am
- src/common-knot/fdset.c 1 addition, 1 deletionsrc/common-knot/fdset.c
- src/common/array-sort.h 4 additions, 0 deletionssrc/common/array-sort.h
- src/common/binsearch.h 2 additions, 0 deletionssrc/common/binsearch.h
- src/common/debug.h 1 addition, 1 deletionsrc/common/debug.h
- src/common/hhash.c 5 additions, 6 deletionssrc/common/hhash.c
- src/common/hhash.h 1 addition, 1 deletionsrc/common/hhash.h
- src/common/lists.c 1 addition, 1 deletionsrc/common/lists.c
- src/common/lists.h 1 addition, 1 deletionsrc/common/lists.h
- src/common/log.c 7 additions, 5 deletionssrc/common/log.c
- src/common/macros.h 19 additions, 55 deletionssrc/common/macros.h
- src/common/mempattern.c 3 additions, 5 deletionssrc/common/mempattern.c
- src/common/mempattern.h 1 addition, 1 deletionsrc/common/mempattern.h
- src/common/mempool.c 1 addition, 1 deletionsrc/common/mempool.c
- src/common/namedb/namedb.h 3 additions, 1 deletionsrc/common/namedb/namedb.h
- src/common/namedb/namedb_lmdb.c 60 additions, 25 deletionssrc/common/namedb/namedb_lmdb.c
- src/common/namedb/namedb_lmdb.h 1 addition, 1 deletionsrc/common/namedb/namedb_lmdb.h
Please register or sign in to comment