Merge pull request #2852 from donaldsharp/bgp_clean

author Russ White <russ@riw.us>

Thu, 16 Aug 2018 15:30:03 +0000 (11:30 -0400)

committer GitHub <noreply@github.com>

Thu, 16 Aug 2018 15:30:03 +0000 (11:30 -0400)
author Russ White <russ@riw.us>
Thu, 16 Aug 2018 15:30:03 +0000 (11:30 -0400)
committer GitHub <noreply@github.com>
Thu, 16 Aug 2018 15:30:03 +0000 (11:30 -0400)
diff --cc bgpd/bgp_route.c
Simple merge
diff --cc bgpd/bgp_vty.c
Simple merge
diff --cc bgpd/bgp_zebra.c
Simple merge
diff --cc bgpd/bgpd.c
Simple merge
author	Russ White <russ@riw.us>
	Thu, 16 Aug 2018 15:30:03 +0000 (11:30 -0400)
committer	GitHub <noreply@github.com>
	Thu, 16 Aug 2018 15:30:03 +0000 (11:30 -0400)
		1	2
bgpd/bgp_route.c	patch \|	diff1 \|	diff2 \|	blob \| history
bgpd/bgp_vty.c	patch \|	diff1 \|	diff2 \|	blob \| history
bgpd/bgp_zebra.c	patch \|	diff1 \|	diff2 \|	blob \| history
bgpd/bgpd.c	patch \|	diff1 \|	diff2 \|	blob \| history