Merge branch 'master' into rr_refactor
Conflicts: src/libknot/tsig-op.c
Showing
- src/knot/ctl/remote.c 3 additions, 3 deletionssrc/knot/ctl/remote.c
- src/knot/nameserver/update.c 19 additions, 5 deletionssrc/knot/nameserver/update.c
- src/knot/server/notify.c 3 additions, 14 deletionssrc/knot/server/notify.c
- src/knot/server/xfr-handler.c 27 additions, 20 deletionssrc/knot/server/xfr-handler.c
- src/knot/server/zone-load.c 2 additions, 0 deletionssrc/knot/server/zone-load.c
- src/knot/server/zones.c 3 additions, 8 deletionssrc/knot/server/zones.c
- src/knot/server/zones.h 4 additions, 8 deletionssrc/knot/server/zones.h
- src/knot/zone/zone.c 1 addition, 1 deletionsrc/knot/zone/zone.c
- src/libknot/tsig-op.c 15 additions, 7 deletionssrc/libknot/tsig-op.c
- src/libknot/tsig-op.h 4 additions, 0 deletionssrc/libknot/tsig-op.h
- tests-extra/tests/records/badrecord/data/badrecord.zone 15 additions, 0 deletionstests-extra/tests/records/badrecord/data/badrecord.zone
- tests-extra/tests/records/badrecord/test.py 24 additions, 0 deletionstests-extra/tests/records/badrecord/test.py
- tests-extra/tests/zone/notexists/test.py 8 additions, 0 deletionstests-extra/tests/zone/notexists/test.py
- tests-extra/tests/zone/reload/data/serial.zone 14 additions, 0 deletionstests-extra/tests/zone/reload/data/serial.zone
- tests-extra/tests/zone/reload/data/serial.zone.1 14 additions, 0 deletionstests-extra/tests/zone/reload/data/serial.zone.1
- tests-extra/tests/zone/reload/data/serial.zone.2 14 additions, 0 deletionstests-extra/tests/zone/reload/data/serial.zone.2
- tests-extra/tests/zone/reload/data/serial.zone.3 14 additions, 0 deletionstests-extra/tests/zone/reload/data/serial.zone.3
- tests-extra/tests/zone/reload/data/serial.zone.4 14 additions, 0 deletionstests-extra/tests/zone/reload/data/serial.zone.4
- tests-extra/tests/zone/reload/test.py 50 additions, 0 deletionstests-extra/tests/zone/reload/test.py
- tests-extra/tools/dnstest/keys.py 4 additions, 4 deletionstests-extra/tools/dnstest/keys.py
Please register or sign in to comment