git.ipfire.org Git - thirdparty/knot-resolver.git/commit

]> git.ipfire.org Git - thirdparty/knot-resolver.git/commit

projects / thirdparty / knot-resolver.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 57b91a0 55f3749)

author	Vladimír Čunát <vladimir.cunat@nic.cz>
	Thu, 25 Jan 2018 08:32:11 +0000 (09:32 +0100)
committer	Vladimír Čunát <vladimir.cunat@nic.cz>
	Thu, 25 Jan 2018 08:32:11 +0000 (09:32 +0100)
commit	41d3c63449e6522f2b08c4085008b26f6111c646
tree	3ec20928e0e249ef1c568f3a31fe0de5cd381450	tree
parent	57b91a0ba0902d24295a0794181d271c691c02f6	commit \| diff
parent	55f3749f71f71c48e0b2c6a2d3d502e0d1c86145	commit \| diff

Merge master into cache-aggr-wip

... to start fixing conflicts with changes in logging

16 files changed:

NEWS	diff1 \|	diff2 \|	blob \| history
config.mk	diff1 \|	diff2 \|	blob \| history
daemon/README.rst	diff1 \|	diff2 \|	blob \| history
daemon/bindings.c	diff1 \|	diff2 \|	blob \| history
daemon/engine.c	diff1 \|	diff2 \|	blob \| history
daemon/lua/kres-gen.lua	diff1 \|	diff2 \|	blob \| history
daemon/worker.c	diff1 \|	diff2 \|	blob \| history
doc/modules.rst	diff1 \|	diff2 \|	blob \| history
lib/layer/iterate.c	diff1 \|	diff2 \|	blob \| history
lib/lib.mk	diff1 \|	diff2 \|	blob \| history
lib/resolve.c	diff1 \|	diff2 \|	blob \| history
lib/resolve.h	diff1 \|	diff2 \|	blob \| history
lib/rplan.h	diff1 \|	diff2 \|	blob \| history
lib/utils.c	diff1 \|	diff2 \|	blob \| history
lib/utils.h	diff1 \|	diff2 \|	blob \| history
modules/modules.mk	diff1 \|	diff2 \|	blob \| history

Mirror of https://gitlab.nic.cz/knot/knot-resolver.git