Merge branch 'master' into packet-api-rewrite
Conflicts: src/knot/server/zones.c src/libknot/nameserver/name-server.c
No related branches found
No related tags found
Showing
- Knot.files 2 additions, 0 deletionsKnot.files
- NEWS 5 additions, 1 deletionNEWS
- configure.ac 1 addition, 1 deletionconfigure.ac
- doc/reference.texi 4 additions, 5 deletionsdoc/reference.texi
- man/knot.conf.5.in 2 additions, 3 deletionsman/knot.conf.5.in
- samples/knot.full.conf 2 additions, 3 deletionssamples/knot.full.conf
- src/Makefile.am 1 addition, 0 deletionssrc/Makefile.am
- src/common/log.c 1 addition, 2 deletionssrc/common/log.c
- src/common/log.h 3 additions, 0 deletionssrc/common/log.h
- src/knot/ctl/remote.c 3 additions, 5 deletionssrc/knot/ctl/remote.c
- src/knot/server/zones.c 58 additions, 61 deletionssrc/knot/server/zones.c
- src/knot/server/zones.h 2 additions, 2 deletionssrc/knot/server/zones.h
- src/knot/zone/zone-load.c 59 additions, 44 deletionssrc/knot/zone/zone-load.c
- src/libknot/dnssec/policy.c 65 additions, 0 deletionssrc/libknot/dnssec/policy.c
- src/libknot/dnssec/policy.h 23 additions, 14 deletionssrc/libknot/dnssec/policy.h
- src/libknot/dnssec/rrset-sign.c 1 addition, 3 deletionssrc/libknot/dnssec/rrset-sign.c
- src/libknot/dnssec/zone-events.c 14 additions, 43 deletionssrc/libknot/dnssec/zone-events.c
- src/libknot/dnssec/zone-events.h 8 additions, 8 deletionssrc/libknot/dnssec/zone-events.h
- src/libknot/dnssec/zone-sign.c 3 additions, 5 deletionssrc/libknot/dnssec/zone-sign.c
- src/libknot/dnssec/zone-sign.h 2 additions, 2 deletionssrc/libknot/dnssec/zone-sign.h
Loading
Please register or sign in to comment