Merge branch 'master' into branch-1.4prep
Conflicts: src/knot/conf/cf-parse.y
No related branches found
No related tags found
Showing
- KNOWN_ISSUES 0 additions, 1 deletionKNOWN_ISSUES
- Knot.files 0 additions, 4 deletionsKnot.files
- src/Makefile.am 0 additions, 2 deletionssrc/Makefile.am
- src/common/acl.c 67 additions, 91 deletionssrc/common/acl.c
- src/common/acl.h 18 additions, 77 deletionssrc/common/acl.h
- src/common/skip-list.c 0 additions, 441 deletionssrc/common/skip-list.c
- src/common/skip-list.h 0 additions, 215 deletionssrc/common/skip-list.h
- src/knot/conf/cf-lex.l 1 addition, 1 deletionsrc/knot/conf/cf-lex.l
- src/knot/conf/cf-parse.y 12 additions, 11 deletionssrc/knot/conf/cf-parse.y
- src/knot/conf/conf.c 2 additions, 2 deletionssrc/knot/conf/conf.c
- src/knot/ctl/remote.c 3 additions, 4 deletionssrc/knot/ctl/remote.c
- src/knot/server/notify.c 1 addition, 1 deletionsrc/knot/server/notify.c
- src/knot/server/tcp-handler.c 0 additions, 1 deletionsrc/knot/server/tcp-handler.c
- src/knot/server/xfr-handler.h 0 additions, 1 deletionsrc/knot/server/xfr-handler.h
- src/knot/server/zones.c 26 additions, 19 deletionssrc/knot/server/zones.c
- src/libknot/edns.c 4 additions, 88 deletionssrc/libknot/edns.c
- src/libknot/edns.h 12 additions, 24 deletionssrc/libknot/edns.h
- src/libknot/nameserver/name-server.c 1 addition, 97 deletionssrc/libknot/nameserver/name-server.c
- src/libknot/nameserver/name-server.h 0 additions, 4 deletionssrc/libknot/nameserver/name-server.h
- src/libknot/packet/response.c 1 addition, 1 deletionsrc/libknot/packet/response.c
Loading
Please register or sign in to comment