Merge branch 'master' into rdataset_rename
Conflicts: src/knot/zone/semantic-check.c
Showing
- src/knot/nameserver/internet.c 10 additions, 3 deletionssrc/knot/nameserver/internet.c
- src/knot/updates/xfr-in.c 3 additions, 2 deletionssrc/knot/updates/xfr-in.c
- src/knot/zone/node.c 7 additions, 18 deletionssrc/knot/zone/node.c
- src/knot/zone/node.h 23 additions, 19 deletionssrc/knot/zone/node.h
- src/knot/zone/semantic-check.c 2 additions, 8 deletionssrc/knot/zone/semantic-check.c
- src/knot/zone/zone-contents.c 26 additions, 5 deletionssrc/knot/zone/zone-contents.c
- src/knot/zone/zone-contents.h 3 additions, 0 deletionssrc/knot/zone/zone-contents.h
- src/knot/zone/zone-create.c 1 addition, 1 deletionsrc/knot/zone/zone-create.c
- tests-extra/tools/dnstest/server.py 1 addition, 0 deletionstests-extra/tools/dnstest/server.py
Please register or sign in to comment