Merge branch 'master' into cache-rrsig-wip
Showing
- .gitignore 3 additions, 0 deletions.gitignore
- .gitmodules 6 additions, 0 deletions.gitmodules
- .travis.yml 11 additions, 4 deletions.travis.yml
- Makefile 2 additions, 1 deletionMakefile
- contrib/libfaketime 1 addition, 0 deletionscontrib/libfaketime
- daemon/engine.c 34 additions, 0 deletionsdaemon/engine.c
- daemon/io.c 1 addition, 0 deletionsdaemon/io.c
- daemon/lua/kres.lua 52 additions, 7 deletionsdaemon/lua/kres.lua
- daemon/main.c 4 additions, 2 deletionsdaemon/main.c
- daemon/worker.c 6 additions, 0 deletionsdaemon/worker.c
- doc/modules.rst 4 additions, 3 deletionsdoc/modules.rst
- help.mk 1 addition, 0 deletionshelp.mk
- lib/layer/iterate.c 24 additions, 0 deletionslib/layer/iterate.c
- lib/resolve.h 5 additions, 6 deletionslib/resolve.h
- lib/rplan.h 4 additions, 3 deletionslib/rplan.h
- lib/utils.c 84 additions, 0 deletionslib/utils.c
- lib/utils.h 13 additions, 0 deletionslib/utils.h
- lib/zonecut.c 2 additions, 26 deletionslib/zonecut.c
- modules/block/block.mk 0 additions, 2 deletionsmodules/block/block.mk
- modules/modules.mk 2 additions, 1 deletionmodules/modules.mk
Please register or sign in to comment