Merge remote-tracking branch 'origin/master' into chain-fix-take2
Conflicts: src/libknot/dnssec/zone-sign.c src/libknot/dnssec/zone-sign.h
No related branches found
No related tags found
Showing
- .gitignore 1 addition, 0 deletions.gitignore
- Knot.files 3 additions, 2 deletionsKnot.files
- src/Makefile.am 4 additions, 3 deletionssrc/Makefile.am
- src/common/hattrie/ahtable.c 0 additions, 656 deletionssrc/common/hattrie/ahtable.c
- src/common/hattrie/ahtable.h 0 additions, 120 deletionssrc/common/hattrie/ahtable.h
- src/common/hattrie/hat-trie.c 110 additions, 166 deletionssrc/common/hattrie/hat-trie.c
- src/common/hattrie/hat-trie.h 2 additions, 3 deletionssrc/common/hattrie/hat-trie.h
- src/common/hhash.c 560 additions, 0 deletionssrc/common/hhash.c
- src/common/hhash.h 197 additions, 0 deletionssrc/common/hhash.h
- src/knot/main.c 13 additions, 2 deletionssrc/knot/main.c
- src/knot/server/server.c 2 additions, 5 deletionssrc/knot/server/server.c
- src/knot/server/tcp-handler.c 2 additions, 2 deletionssrc/knot/server/tcp-handler.c
- src/knot/server/udp-handler.c 2 additions, 2 deletionssrc/knot/server/udp-handler.c
- src/knot/server/xfr-handler.h 0 additions, 1 deletionsrc/knot/server/xfr-handler.h
- src/knot/server/zone-load.c 2 additions, 2 deletionssrc/knot/server/zone-load.c
- src/knot/zone/estimator.c 13 additions, 14 deletionssrc/knot/zone/estimator.c
- src/libknot/dnssec/config.h 11 additions, 0 deletionssrc/libknot/dnssec/config.h
- src/libknot/dnssec/crypto.c 210 additions, 0 deletionssrc/libknot/dnssec/crypto.c
- src/libknot/dnssec/crypto.h 69 additions, 0 deletionssrc/libknot/dnssec/crypto.h
- src/libknot/dnssec/key.c 1 addition, 0 deletionssrc/libknot/dnssec/key.c
Loading
Please register or sign in to comment