Merge pull request #731 from qlyoung/fix-bgp-misc-cli

author Russ White <russ@riw.us>

Tue, 20 Jun 2017 01:53:05 +0000 (21:53 -0400)

committer GitHub <noreply@github.com>

Tue, 20 Jun 2017 01:53:05 +0000 (21:53 -0400)
author Russ White <russ@riw.us>
Tue, 20 Jun 2017 01:53:05 +0000 (21:53 -0400)
committer GitHub <noreply@github.com>
Tue, 20 Jun 2017 01:53:05 +0000 (21:53 -0400)
diff --cc bgpd/bgp_vty.c
Simple merge
diff --cc bgpd/bgpd.c
Simple merge
author	Russ White <russ@riw.us>
	Tue, 20 Jun 2017 01:53:05 +0000 (21:53 -0400)
committer	GitHub <noreply@github.com>
	Tue, 20 Jun 2017 01:53:05 +0000 (21:53 -0400)
		1	2
bgpd/bgp_vty.c	patch \|	diff1 \|	diff2 \|	blob \| history
bgpd/bgpd.c	patch \|	diff1 \|	diff2 \|	blob \| history