Merge branch 'branch-1.4prep' into feature-dnssec
Conflicts: src/Makefile.am src/knot/conf/conf.c src/libknot/dnssec/key.c src/libknot/updates/changesets.c src/libknot/zone/zone-contents.c src/libknot/zone/zone-diff.c
No related branches found
No related tags found
Showing
- .gitignore 10 additions, 8 deletions.gitignore
- Knot.files 4 additions, 2 deletionsKnot.files
- NEWS 11 additions, 0 deletionsNEWS
- configure.ac 9 additions, 6 deletionsconfigure.ac
- doc/reference.texi 15 additions, 26 deletionsdoc/reference.texi
- man/knot.conf.5.in 10 additions, 6 deletionsman/knot.conf.5.in
- samples/knot.full.conf 10 additions, 6 deletionssamples/knot.full.conf
- samples/knot.sample.conf.in 4 additions, 1 deletionsamples/knot.sample.conf.in
- src/Makefile.am 4 additions, 37 deletionssrc/Makefile.am
- src/common/descriptor.c 23 additions, 28 deletionssrc/common/descriptor.c
- src/common/descriptor.h 4 additions, 1 deletionsrc/common/descriptor.h
- src/common/errcode.c 1 addition, 67 deletionssrc/common/errcode.c
- src/common/errcode.h 1 addition, 68 deletionssrc/common/errcode.h
- src/common/sockaddr.c 41 additions, 0 deletionssrc/common/sockaddr.c
- src/common/sockaddr.h 7 additions, 0 deletionssrc/common/sockaddr.h
- src/knot/conf/cf-parse.y 44 additions, 2 deletionssrc/knot/conf/cf-parse.y
- src/knot/conf/conf.c 32 additions, 18 deletionssrc/knot/conf/conf.c
- src/knot/conf/conf.h 2 additions, 3 deletionssrc/knot/conf/conf.h
- src/knot/ctl/process.c 17 additions, 1 deletionsrc/knot/ctl/process.c
- src/knot/main.c 0 additions, 1 deletionsrc/knot/main.c
Loading
Please register or sign in to comment