Merge branch 'master' into dname_refactor
Only rrset.h conflicts resolved! Conflicts: src/libknot/rrset.h src/libknot/updates/xfr-in.c src/libknot/zone/zone-contents.c
Showing
- configure.ac 10 additions, 16 deletionsconfigure.ac
- doc/configuration.texi 2 additions, 3 deletionsdoc/configuration.texi
- doc/reference.texi 1 addition, 1 deletiondoc/reference.texi
- doc/running.texi 0 additions, 2 deletionsdoc/running.texi
- m4/ax_recvmmsg.m4 0 additions, 96 deletionsm4/ax_recvmmsg.m4
- man/knot.conf.5.in 2 additions, 2 deletionsman/knot.conf.5.in
- man/knotc.8.in 0 additions, 3 deletionsman/knotc.8.in
- samples/knot.full.conf 3 additions, 3 deletionssamples/knot.full.conf
- samples/knot.sample.conf.in 1 addition, 1 deletionsamples/knot.sample.conf.in
- src/common/acl.c 74 additions, 63 deletionssrc/common/acl.c
- src/common/descriptor.c 41 additions, 8 deletionssrc/common/descriptor.c
- src/common/descriptor.h 30 additions, 3 deletionssrc/common/descriptor.h
- src/common/errcode.c 1 addition, 1 deletionsrc/common/errcode.c
- src/common/errcode.h 1 addition, 1 deletionsrc/common/errcode.h
- src/knot/conf/conf.c 1 addition, 1 deletionsrc/knot/conf/conf.c
- src/knot/conf/conf.h 1 addition, 1 deletionsrc/knot/conf/conf.h
- src/knot/ctl/knotc_main.c 1 addition, 13 deletionssrc/knot/ctl/knotc_main.c
- src/knot/server/dthreads.c 1 addition, 2 deletionssrc/knot/server/dthreads.c
- src/knot/server/server.c 4 additions, 1 deletionsrc/knot/server/server.c
- src/knot/server/tcp-handler.c 35 additions, 37 deletionssrc/knot/server/tcp-handler.c
Loading
Please register or sign in to comment