Merge branch 'rrset' into rrset_owner_shared
Conflicts: src/libknot/updates/changesets.c src/libknot/updates/ddns.c src/libknot/updates/xfr-in.c
Showing
- .gitignore 10 additions, 8 deletions.gitignore
- Knot.files 4 additions, 2 deletionsKnot.files
- configure.ac 7 additions, 4 deletionsconfigure.ac
- 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/knot/server/server.c 3 additions, 1 deletionsrc/knot/server/server.c
- src/knot/server/xfr-handler.c 2 additions, 2 deletionssrc/knot/server/xfr-handler.c
- src/knot/server/zones.c 70 additions, 85 deletionssrc/knot/server/zones.c
- src/knot/zone/zone-load.c 8 additions, 3 deletionssrc/knot/zone/zone-load.c
- src/knot/zone/zone-load.h 1 addition, 1 deletionsrc/knot/zone/zone-load.h
- src/libknot/nameserver/name-server.c 25 additions, 23 deletionssrc/libknot/nameserver/name-server.c
- src/libknot/sign/key.c 3 additions, 14 deletionssrc/libknot/sign/key.c
- src/libknot/updates/changesets.c 168 additions, 458 deletionssrc/libknot/updates/changesets.c
- src/libknot/updates/changesets.h 176 additions, 103 deletionssrc/libknot/updates/changesets.h
- src/libknot/updates/ddns.c 149 additions, 149 deletionssrc/libknot/updates/ddns.c
- src/libknot/updates/xfr-in.c 244 additions, 512 deletionssrc/libknot/updates/xfr-in.c
- src/libknot/updates/xfr-in.h 3 additions, 4 deletionssrc/libknot/updates/xfr-in.h
Please register or sign in to comment