Merge branch 'master' into public-libs-common
Conflicts: src/libknot/internal/namedb/namedb.h src/libknot/internal/namedb/namedb_lmdb.c src/libknot/internal/namedb/namedb_trie.c
No related branches found
No related tags found
Showing
- src/knot/nameserver/internet.c 0 additions, 1 deletionsrc/knot/nameserver/internet.c
- src/knot/nameserver/process_query.c 44 additions, 19 deletionssrc/knot/nameserver/process_query.c
- src/knot/nameserver/process_query.h 2 additions, 2 deletionssrc/knot/nameserver/process_query.h
- src/libknot/consts.h 9 additions, 0 deletionssrc/libknot/consts.h
- src/libknot/internal/namedb/namedb.h 19 additions, 5 deletionssrc/libknot/internal/namedb/namedb.h
- src/libknot/internal/namedb/namedb_lmdb.c 111 additions, 89 deletionssrc/libknot/internal/namedb/namedb_lmdb.c
- src/libknot/internal/namedb/namedb_trie.c 26 additions, 3 deletionssrc/libknot/internal/namedb/namedb_trie.c
- src/libknot/rrtype/opt.h 16 additions, 2 deletionssrc/libknot/rrtype/opt.h
- tests/namedb.c 58 additions, 1 deletiontests/namedb.c
Loading
Please register or sign in to comment