Merge branch 'master' into internal_reduction
Conflicts: src/contrib/macros.h src/knot/nameserver/update.c src/knot/zone/events/handlers.c src/knot/zone/timers.c src/knot/zone/timers.h src/libknot/dname.h src/libknot/packet/wire.h
No related branches found
No related tags found
Showing
- Knot.files 1 addition, 1 deletionKnot.files
- doc/man/knot.conf.5in 20 additions, 5 deletionsdoc/man/knot.conf.5in
- doc/reference.rst 24 additions, 5 deletionsdoc/reference.rst
- src/knot/conf/base.c 4 additions, 0 deletionssrc/knot/conf/base.c
- src/knot/conf/base.h 4 additions, 0 deletionssrc/knot/conf/base.h
- src/knot/conf/scheme.c 2 additions, 1 deletionsrc/knot/conf/scheme.c
- src/knot/conf/scheme.h 1 addition, 0 deletionssrc/knot/conf/scheme.h
- src/knot/conf/tools.c 18 additions, 15 deletionssrc/knot/conf/tools.c
- src/knot/ctl/knotc_main.c 2 additions, 2 deletionssrc/knot/ctl/knotc_main.c
- src/knot/ctl/remote.c 4 additions, 4 deletionssrc/knot/ctl/remote.c
- src/knot/modules/dnsproxy.c 2 additions, 2 deletionssrc/knot/modules/dnsproxy.c
- src/knot/nameserver/process_query.c 2 additions, 1 deletionsrc/knot/nameserver/process_query.c
- src/knot/nameserver/update.c 4 additions, 4 deletionssrc/knot/nameserver/update.c
- src/knot/server/server.c 5 additions, 1 deletionsrc/knot/server/server.c
- src/knot/server/tcp-handler.c 10 additions, 10 deletionssrc/knot/server/tcp-handler.c
- src/knot/server/udp-handler.c 4 additions, 5 deletionssrc/knot/server/udp-handler.c
- src/knot/zone/events/handlers.c 4 additions, 4 deletionssrc/knot/zone/events/handlers.c
- src/knot/zone/timers.c 5 additions, 12 deletionssrc/knot/zone/timers.c
- src/knot/zone/timers.h 3 additions, 3 deletionssrc/knot/zone/timers.h
- src/libknot/attribute.h 15 additions, 0 deletionssrc/libknot/attribute.h
Loading
Please register or sign in to comment