Merge remote-tracking branch 'origin/master' into cleanup_node
Conflicts: src/knot/updates/xfr-in.c src/knot/zone/estimator.c src/knot/zone/node.c
No related branches found
No related tags found
Showing
- src/knot/ctl/knotc_main.c 13 additions, 15 deletionssrc/knot/ctl/knotc_main.c
- src/knot/updates/xfr-in.c 26 additions, 22 deletionssrc/knot/updates/xfr-in.c
- src/knot/zone/estimator.c 39 additions, 78 deletionssrc/knot/zone/estimator.c
- src/knot/zone/estimator.h 3 additions, 4 deletionssrc/knot/zone/estimator.h
- src/knot/zone/node.c 5 additions, 0 deletionssrc/knot/zone/node.c
Loading
Please register or sign in to comment