Merge pull request #2196 from LabNConsulting/working/master/bgpd-shutdown-race

author Russ White <russ@riw.us>

Sat, 12 May 2018 10:27:00 +0000 (06:27 -0400)

committer GitHub <noreply@github.com>

Sat, 12 May 2018 10:27:00 +0000 (06:27 -0400)
author Russ White <russ@riw.us>
Sat, 12 May 2018 10:27:00 +0000 (06:27 -0400)
committer GitHub <noreply@github.com>
Sat, 12 May 2018 10:27:00 +0000 (06:27 -0400)
diff --cc bgpd/bgpd.c
Simple merge
diff --cc bgpd/bgpd.h
Simple merge
author	Russ White <russ@riw.us>
	Sat, 12 May 2018 10:27:00 +0000 (06:27 -0400)
committer	GitHub <noreply@github.com>
	Sat, 12 May 2018 10:27:00 +0000 (06:27 -0400)
		1	2
bgpd/bgpd.c	patch \|	diff1 \|	diff2 \|	blob \| history
bgpd/bgpd.h	patch \|	diff1 \|	diff2 \|	blob \| history