Merge branch 'master' into dnssec-over-ddns
Conflicts: src/knot/server/zones.c
No related branches found
No related tags found
Showing
- doc/configuration.texi 9 additions, 26 deletionsdoc/configuration.texi
- doc/introduction.texi 1 addition, 2 deletionsdoc/introduction.texi
- doc/knot.texi 2 additions, 0 deletionsdoc/knot.texi
- doc/migration.texi 58 additions, 6 deletionsdoc/migration.texi
- doc/reference.texi 33 additions, 7 deletionsdoc/reference.texi
- doc/running.texi 1 addition, 3 deletionsdoc/running.texi
- man/knot.conf.5.in 13 additions, 3 deletionsman/knot.conf.5.in
- samples/knot.full.conf 10 additions, 0 deletionssamples/knot.full.conf
- src/common/hattrie/hat-trie.c 3 additions, 1 deletionsrc/common/hattrie/hat-trie.c
- src/common/hex.c 7 additions, 4 deletionssrc/common/hex.c
- src/common/log.c 1 addition, 1 deletionsrc/common/log.c
- src/knot/conf/cf-lex.l 11 additions, 0 deletionssrc/knot/conf/cf-lex.l
- src/knot/conf/cf-parse.y 10 additions, 2 deletionssrc/knot/conf/cf-parse.y
- src/knot/conf/conf.c 5 additions, 0 deletionssrc/knot/conf/conf.c
- src/knot/conf/conf.h 12 additions, 1 deletionsrc/knot/conf/conf.h
- src/knot/ctl/remote.c 0 additions, 2 deletionssrc/knot/ctl/remote.c
- src/knot/main.c 12 additions, 4 deletionssrc/knot/main.c
- src/knot/server/dthreads.c 1 addition, 1 deletionsrc/knot/server/dthreads.c
- src/knot/server/journal.c 1 addition, 0 deletionssrc/knot/server/journal.c
- src/knot/server/tcp-handler.c 1 addition, 0 deletionssrc/knot/server/tcp-handler.c
Loading
Please register or sign in to comment