Merge branch 'master' into resolver_compat
Conflicts: Knot.files src/Makefile.am tests/Makefile.am
Showing
- .gitignore 4 additions, 2 deletions.gitignore
- Knot.files 2 additions, 9 deletionsKnot.files
- Makefile.am 25 additions, 60 deletionsMakefile.am
- configure.ac 1 addition, 1 deletionconfigure.ac
- src/Makefile.am 0 additions, 3 deletionssrc/Makefile.am
- src/common-knot/slab/alloc-common.h 0 additions, 57 deletionssrc/common-knot/slab/alloc-common.h
- src/common-knot/slab/slab.c 0 additions, 513 deletionssrc/common-knot/slab/slab.c
- src/common-knot/slab/slab.h 0 additions, 275 deletionssrc/common-knot/slab/slab.h
- src/common/log.c 0 additions, 1 deletionsrc/common/log.c
- src/dnstap/dnstap.c 1 addition, 1 deletionsrc/dnstap/dnstap.c
- src/knot/conf/conf.c 1 addition, 1 deletionsrc/knot/conf/conf.c
- src/knot/ctl/remote.c 5 additions, 5 deletionssrc/knot/ctl/remote.c
- src/knot/nameserver/internet.c 1 addition, 1 deletionsrc/knot/nameserver/internet.c
- src/knot/nameserver/process_query.c 12 additions, 6 deletionssrc/knot/nameserver/process_query.c
- src/knot/zone/events/events.c 1 addition, 1 deletionsrc/knot/zone/events/events.c
- src/knot/zone/events/events.h 1 addition, 1 deletionsrc/knot/zone/events/events.h
- src/knot/zone/events/replan.c 4 additions, 4 deletionssrc/knot/zone/events/replan.c
- src/knot/zone/events/replan.h 2 additions, 2 deletionssrc/knot/zone/events/replan.h
- src/libknot/consts.c 16 additions, 7 deletionssrc/libknot/consts.c
- src/libknot/consts.h 19 additions, 8 deletionssrc/libknot/consts.h
Loading
Please register or sign in to comment