Merge pull request #1831 from qlyoung/frr-pthread-fixups

author Renato Westphal <renato@openbsd.org>

Tue, 13 Mar 2018 21:22:22 +0000 (18:22 -0300)

committer GitHub <noreply@github.com>

Tue, 13 Mar 2018 21:22:22 +0000 (18:22 -0300)
author Renato Westphal <renato@openbsd.org>
Tue, 13 Mar 2018 21:22:22 +0000 (18:22 -0300)
committer GitHub <noreply@github.com>
Tue, 13 Mar 2018 21:22:22 +0000 (18:22 -0300)
diff --cc bgpd/bgpd.c
Simple merge
diff --cc lib/thread.c
Simple merge
author	Renato Westphal <renato@openbsd.org>
	Tue, 13 Mar 2018 21:22:22 +0000 (18:22 -0300)
committer	GitHub <noreply@github.com>
	Tue, 13 Mar 2018 21:22:22 +0000 (18:22 -0300)
		1	2
bgpd/bgpd.c	patch \|	diff1 \|	diff2 \|	blob \| history
lib/thread.c	patch \|	diff1 \|	diff2 \|	blob \| history