Merge pull request #1808 from qlyoung/debug-mt-safe

author Renato Westphal <renato@openbsd.org>

Fri, 9 Mar 2018 14:25:37 +0000 (11:25 -0300)

committer GitHub <noreply@github.com>

Fri, 9 Mar 2018 14:25:37 +0000 (11:25 -0300)
author Renato Westphal <renato@openbsd.org>
Fri, 9 Mar 2018 14:25:37 +0000 (11:25 -0300)
committer GitHub <noreply@github.com>
Fri, 9 Mar 2018 14:25:37 +0000 (11:25 -0300)
diff --cc lib/zebra.h
Simple merge
diff --cc vtysh/vtysh.c
Simple merge
author	Renato Westphal <renato@openbsd.org>
	Fri, 9 Mar 2018 14:25:37 +0000 (11:25 -0300)
committer	GitHub <noreply@github.com>
	Fri, 9 Mar 2018 14:25:37 +0000 (11:25 -0300)
		1	2
lib/zebra.h	patch \|	diff1 \|	diff2 \|	blob \| history
vtysh/vtysh.c	patch \|	diff1 \|	diff2 \|	blob \| history