TMP Merge branch 'valid-nxdomain' into cache-aggr-wip

author Vladimír Čunát <vladimir.cunat@nic.cz>

Tue, 16 Jan 2018 14:13:13 +0000 (15:13 +0100)

committer Vladimír Čunát <vladimir.cunat@nic.cz>

Tue, 16 Jan 2018 14:13:13 +0000 (15:13 +0100)
author Vladimír Čunát <vladimir.cunat@nic.cz>
Tue, 16 Jan 2018 14:13:13 +0000 (15:13 +0100)
committer Vladimír Čunát <vladimir.cunat@nic.cz>
Tue, 16 Jan 2018 14:13:13 +0000 (15:13 +0100)
diff --cc Makefile
Simple merge
diff --cc daemon/README.rst
Simple merge
diff --cc daemon/bindings.c
Simple merge
diff --cc lib/defines.h
Simple merge
diff --cc lib/layer/iterate.c
Simple merge
diff --cc lib/resolve.c
Simple merge
diff --cc lib/utils.c
Simple merge
diff --cc lib/utils.h
Simple merge
author	Vladimír Čunát <vladimir.cunat@nic.cz>
	Tue, 16 Jan 2018 14:13:13 +0000 (15:13 +0100)
committer	Vladimír Čunát <vladimir.cunat@nic.cz>
	Tue, 16 Jan 2018 14:13:13 +0000 (15:13 +0100)
		1	2
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
daemon/README.rst	patch \|	diff1 \|	diff2 \|	blob \| history
daemon/bindings.c	patch \|	diff1 \|	diff2 \|	blob \| history
lib/defines.h	patch \|	diff1 \|	diff2 \|	blob \| history
lib/layer/iterate.c	patch \|	diff1 \|	diff2 \|	blob \| history
lib/resolve.c	patch \|	diff1 \|	diff2 \|	blob \| history
lib/utils.c	patch \|	diff1 \|	diff2 \|	blob \| history
lib/utils.h	patch \|	diff1 \|	diff2 \|	blob \| history