Merge branch 'master' into branch-1.4prep
Conflicts: Knot.files src/Makefile.am
Showing
- Knot.files 4 additions, 0 deletionsKnot.files
- NEWS 12 additions, 3 deletionsNEWS
- configure.ac 1 addition, 1 deletionconfigure.ac
- doc/configuration.texi 12 additions, 4 deletionsdoc/configuration.texi
- doc/reference.texi 4 additions, 5 deletionsdoc/reference.texi
- doc/running.texi 14 additions, 2 deletionsdoc/running.texi
- man/knotc.8in 3 additions, 0 deletionsman/knotc.8in
- samples/knot.full.conf 1 addition, 1 deletionsamples/knot.full.conf
- src/Makefile.am 4 additions, 1 deletionsrc/Makefile.am
- src/common/errcode.h 17 additions, 11 deletionssrc/common/errcode.h
- src/common/errors.c 2 additions, 1 deletionsrc/common/errors.c
- src/common/hattrie/ahtable.h 1 addition, 1 deletionsrc/common/hattrie/ahtable.h
- src/common/hattrie/hat-trie.c 19 additions, 0 deletionssrc/common/hattrie/hat-trie.c
- src/common/hattrie/hat-trie.h 1 addition, 0 deletionssrc/common/hattrie/hat-trie.h
- src/knot/conf/cf-parse.y 8 additions, 8 deletionssrc/knot/conf/cf-parse.y
- src/knot/conf/conf.c 13 additions, 35 deletionssrc/knot/conf/conf.c
- src/knot/conf/conf.h 1 addition, 1 deletionsrc/knot/conf/conf.h
- src/knot/ctl/knotc_main.c 119 additions, 1 deletionsrc/knot/ctl/knotc_main.c
- src/knot/main.c 8 additions, 5 deletionssrc/knot/main.c
- src/knot/server/zones.c 41 additions, 13 deletionssrc/knot/server/zones.c
Please register or sign in to comment