Merge pull request #32 from qlyoung/fix-cli-nits2

author Donald Sharp <sharpd@cumulusnetworks.com>

Sat, 7 Jan 2017 00:38:28 +0000 (19:38 -0500)

committer GitHub <noreply@github.com>

Sat, 7 Jan 2017 00:38:28 +0000 (19:38 -0500)
author Donald Sharp <sharpd@cumulusnetworks.com>
Sat, 7 Jan 2017 00:38:28 +0000 (19:38 -0500)
committer GitHub <noreply@github.com>
Sat, 7 Jan 2017 00:38:28 +0000 (19:38 -0500)
diff --cc bgpd/bgp_route.c
Simple merge
diff --cc bgpd/bgp_vty.c
Simple merge
diff --cc zebra/zebra_vty.c
Simple merge
author	Donald Sharp <sharpd@cumulusnetworks.com>
	Sat, 7 Jan 2017 00:38:28 +0000 (19:38 -0500)
committer	GitHub <noreply@github.com>
	Sat, 7 Jan 2017 00:38:28 +0000 (19:38 -0500)
		1	2
bgpd/bgp_route.c	patch \|	diff1 \|	diff2 \|	blob \| history
bgpd/bgp_vty.c	patch \|	diff1 \|	diff2 \|	blob \| history
zebra/zebra_vty.c	patch \|	diff1 \|	diff2 \|	blob \| history