Merge branch 'master' into new_node
Conflicts: src/knot/dnssec/zone-sign.c src/knot/updates/ddns.c src/knot/updates/xfr-in.c src/knot/zone/node.c src/knot/zone/node.h src/knot/zone/semantic-check.c src/knot/zone/zone-contents.c src/knot/zone/zone-contents.h src/knot/zone/zone-create.c src/libknot/rrset.c tests-extra/tests/ddns/basic/test.py Note: ddns/basic fails now, but I don't think it's caused by my merge jutsu.
Showing
- .travis.yml 13 additions, 0 deletions.travis.yml
- coverity_model.c 19 additions, 0 deletionscoverity_model.c
- src/common/errcode.c 2 additions, 1 deletionsrc/common/errcode.c
- src/common/errcode.h 1 addition, 0 deletionssrc/common/errcode.h
- src/knot/conf/cf-parse.y 22 additions, 24 deletionssrc/knot/conf/cf-parse.y
- src/knot/conf/conf.c 4 additions, 10 deletionssrc/knot/conf/conf.c
- src/knot/dnssec/nsec3-chain.c 2 additions, 2 deletionssrc/knot/dnssec/nsec3-chain.c
- src/knot/main.c 32 additions, 41 deletionssrc/knot/main.c
- src/knot/nameserver/axfr.c 14 additions, 14 deletionssrc/knot/nameserver/axfr.c
- src/knot/nameserver/update.c 18 additions, 12 deletionssrc/knot/nameserver/update.c
- src/knot/server/net.c 6 additions, 8 deletionssrc/knot/server/net.c
- src/knot/server/zone-load.c 15 additions, 11 deletionssrc/knot/server/zone-load.c
- src/knot/updates/ddns.c 9 additions, 0 deletionssrc/knot/updates/ddns.c
- src/knot/updates/xfr-in.c 15 additions, 2 deletionssrc/knot/updates/xfr-in.c
- src/knot/zone/node.c 13 additions, 2 deletionssrc/knot/zone/node.c
- src/knot/zone/node.h 1 addition, 1 deletionsrc/knot/zone/node.h
- src/knot/zone/semantic-check.c 0 additions, 53 deletionssrc/knot/zone/semantic-check.c
- src/knot/zone/semantic-check.h 0 additions, 13 deletionssrc/knot/zone/semantic-check.h
- src/knot/zone/zone-contents.c 4 additions, 4 deletionssrc/knot/zone/zone-contents.c
- src/knot/zone/zone-contents.h 1 addition, 1 deletionsrc/knot/zone/zone-contents.h
Please register or sign in to comment