Merge remote-tracking branch 'origin/stable/3.0'

author Donald Sharp <sharpd@cumulusnetworks.com>

Mon, 15 May 2017 01:19:33 +0000 (21:19 -0400)

committer Donald Sharp <sharpd@cumulusnetworks.com>

Mon, 15 May 2017 01:19:33 +0000 (21:19 -0400)
author Donald Sharp <sharpd@cumulusnetworks.com>
Mon, 15 May 2017 01:19:33 +0000 (21:19 -0400)
committer Donald Sharp <sharpd@cumulusnetworks.com>
Mon, 15 May 2017 01:19:33 +0000 (21:19 -0400)
diff --cc bgpd/bgp_route.c
Simple merge
diff --cc vtysh/vtysh.c
Simple merge
author	Donald Sharp <sharpd@cumulusnetworks.com>
	Mon, 15 May 2017 01:19:33 +0000 (21:19 -0400)
committer	Donald Sharp <sharpd@cumulusnetworks.com>
	Mon, 15 May 2017 01:19:33 +0000 (21:19 -0400)
		1	2
bgpd/bgp_route.c	patch \|	diff1 \|	diff2 \|	blob \| history
vtysh/vtysh.c	patch \|	diff1 \|	diff2 \|	blob \| history