Merge pull request #408 from qlyoung/remove-thread-macros

author Russ White <russ@riw.us>

Wed, 10 May 2017 17:51:47 +0000 (13:51 -0400)

committer GitHub <noreply@github.com>

Wed, 10 May 2017 17:51:47 +0000 (13:51 -0400)
author Russ White <russ@riw.us>
Wed, 10 May 2017 17:51:47 +0000 (13:51 -0400)
committer GitHub <noreply@github.com>
Wed, 10 May 2017 17:51:47 +0000 (13:51 -0400)
diff --cc bgpd/bgpd.c
Simple merge
diff --cc lib/agentx.c
Simple merge
author	Russ White <russ@riw.us>
	Wed, 10 May 2017 17:51:47 +0000 (13:51 -0400)
committer	GitHub <noreply@github.com>
	Wed, 10 May 2017 17:51:47 +0000 (13:51 -0400)
		1	2
bgpd/bgpd.c	patch \|	diff1 \|	diff2 \|	blob \| history
lib/agentx.c	patch \|	diff1 \|	diff2 \|	blob \| history