Merge pull request #254 from donaldsharp/shutdown3

author Donald Sharp <sharpd@cumulusnetworks.com>

Tue, 7 Mar 2017 16:29:44 +0000 (11:29 -0500)

committer GitHub <noreply@github.com>

Tue, 7 Mar 2017 16:29:44 +0000 (11:29 -0500)
author Donald Sharp <sharpd@cumulusnetworks.com>
Tue, 7 Mar 2017 16:29:44 +0000 (11:29 -0500)
committer GitHub <noreply@github.com>
Tue, 7 Mar 2017 16:29:44 +0000 (11:29 -0500)
diff --cc bgpd/bgp_vty.c
Simple merge
diff --cc bgpd/bgpd.h
Simple merge
author	Donald Sharp <sharpd@cumulusnetworks.com>
	Tue, 7 Mar 2017 16:29:44 +0000 (11:29 -0500)
committer	GitHub <noreply@github.com>
	Tue, 7 Mar 2017 16:29:44 +0000 (11:29 -0500)
		1	2
bgpd/bgp_vty.c	patch \|	diff1 \|	diff2 \|	blob \| history
bgpd/bgpd.h	patch \|	diff1 \|	diff2 \|	blob \| history