Merge branch 'branch-1.4prep' into feature-dnssec
Conflicts: src/knot/zone/semantic-check.c src/libknot/dname.c src/libknot/dname.h src/libknot/dnssec/key.c src/libknot/rrset.c src/libknot/rrset.h src/libknot/zone/zone-contents.c src/tests/libknot/sign_tests.c src/utils/common/params.c
No related branches found
No related tags found
Showing
- KNOWN_ISSUES 0 additions, 1 deletionKNOWN_ISSUES
- Knot.files 0 additions, 4 deletionsKnot.files
- doc/running.texi 1 addition, 1 deletiondoc/running.texi
- 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/mempattern.h 3 additions, 0 deletionssrc/common/mempattern.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/common/sockaddr.c 2 additions, 2 deletionssrc/common/sockaddr.c
- src/knot/conf/cf-lex.l 1 addition, 1 deletionsrc/knot/conf/cf-lex.l
- src/knot/conf/cf-parse.y 20 additions, 19 deletionssrc/knot/conf/cf-parse.y
- src/knot/conf/conf.c 2 additions, 2 deletionssrc/knot/conf/conf.c
- src/knot/ctl/knotc_main.c 1 addition, 1 deletionsrc/knot/ctl/knotc_main.c
- src/knot/ctl/remote.c 24 additions, 25 deletionssrc/knot/ctl/remote.c
- src/knot/main.c 1 addition, 3 deletionssrc/knot/main.c
- src/knot/server/notify.c 5 additions, 14 deletionssrc/knot/server/notify.c
- src/knot/server/rrl.c 16 additions, 25 deletionssrc/knot/server/rrl.c
- src/knot/server/rrl.h 1 addition, 1 deletionsrc/knot/server/rrl.h
- src/knot/server/tcp-handler.c 39 additions, 25 deletionssrc/knot/server/tcp-handler.c
Loading
Please register or sign in to comment