Merge branch 'master' into chain-fix
Conflicts: src/knot/server/zones.c src/libknot/dnssec/zone-events.c src/libknot/dnssec/zone-events.h src/libknot/updates/xfr-in.c
No related branches found
No related tags found
Showing
- .gitignore 2 additions, 0 deletions.gitignore
- Knot.files 21 additions, 7 deletionsKnot.files
- Makefile.am 1 addition, 1 deletionMakefile.am
- NEWS 11 additions, 0 deletionsNEWS
- configure.ac 3 additions, 2 deletionsconfigure.ac
- doc/reference.texi 4 additions, 5 deletionsdoc/reference.texi
- man/knot.conf.5.in 2 additions, 3 deletionsman/knot.conf.5.in
- patches/Makefile.am 1 addition, 0 deletionspatches/Makefile.am
- patches/strptime_susv3.patch 21 additions, 0 deletionspatches/strptime_susv3.patch
- samples/knot.full.conf 2 additions, 3 deletionssamples/knot.full.conf
- scripts/urcu-tls-compat.patch 0 additions, 1495 deletionsscripts/urcu-tls-compat.patch
- src/Makefile.am 18 additions, 7 deletionssrc/Makefile.am
- src/common/acl.c 28 additions, 41 deletionssrc/common/acl.c
- src/common/acl.h 7 additions, 3 deletionssrc/common/acl.h
- src/common/hhash.c 1 addition, 1 deletionsrc/common/hhash.c
- src/common/lists.c 48 additions, 0 deletionssrc/common/lists.c
- src/common/lists.h 10 additions, 4 deletionssrc/common/lists.h
- src/common/log.c 1 addition, 2 deletionssrc/common/log.c
- src/common/log.h 3 additions, 0 deletionssrc/common/log.h
- src/common/mempattern.c 8 additions, 0 deletionssrc/common/mempattern.c
Loading
Please register or sign in to comment