Merge branch 'master' into cache-rrsig-wip
Conflicts: lib/layer/rrcache.c lib/resolve.c lib/resolve.h lib/rplan.h lib/zonecut.c modules/stats/stats.c
Showing
- .travis.yml 4 additions, 0 deletions.travis.yml
- README.md 5 additions, 1 deletionREADME.md
- contrib/config.h 5 additions, 1 deletioncontrib/config.h
- contrib/ucw/lib.h 1 addition, 122 deletionscontrib/ucw/lib.h
- daemon/README.rst 9 additions, 1 deletiondaemon/README.rst
- daemon/bindings.c 16 additions, 1 deletiondaemon/bindings.c
- daemon/engine.c 12 additions, 4 deletionsdaemon/engine.c
- daemon/engine.h 1 addition, 1 deletiondaemon/engine.h
- daemon/io.c 27 additions, 35 deletionsdaemon/io.c
- daemon/io.h 1 addition, 2 deletionsdaemon/io.h
- daemon/lua/sandbox.lua 1 addition, 1 deletiondaemon/lua/sandbox.lua
- daemon/main.c 4 additions, 1 deletiondaemon/main.c
- daemon/worker.c 166 additions, 106 deletionsdaemon/worker.c
- daemon/worker.h 4 additions, 2 deletionsdaemon/worker.h
- doc/modules.rst 1 addition, 1 deletiondoc/modules.rst
- lib/defines.h 2 additions, 2 deletionslib/defines.h
- lib/generic/lru.h 38 additions, 12 deletionslib/generic/lru.h
- lib/layer/iterate.c 1 addition, 39 deletionslib/layer/iterate.c
- lib/layer/pktcache.c 1 addition, 1 deletionlib/layer/pktcache.c
- lib/layer/rrcache.c 34 additions, 11 deletionslib/layer/rrcache.c
Please register or sign in to comment