Merge pull request #4413 from donaldsharp/bgp_distance_comes_closer

author Sri Mohana Singamsetty <srimohans@gmail.com>

Thu, 30 May 2019 16:45:43 +0000 (09:45 -0700)

committer GitHub <noreply@github.com>

Thu, 30 May 2019 16:45:43 +0000 (09:45 -0700)
author Sri Mohana Singamsetty <srimohans@gmail.com>
Thu, 30 May 2019 16:45:43 +0000 (09:45 -0700)
committer GitHub <noreply@github.com>
Thu, 30 May 2019 16:45:43 +0000 (09:45 -0700)
diff --cc bgpd/bgp_zebra.c
Simple merge
diff --cc zebra/zebra_rib.c
Simple merge
author	Sri Mohana Singamsetty <srimohans@gmail.com>
	Thu, 30 May 2019 16:45:43 +0000 (09:45 -0700)
committer	GitHub <noreply@github.com>
	Thu, 30 May 2019 16:45:43 +0000 (09:45 -0700)
		1	2
bgpd/bgp_zebra.c	patch \|	diff1 \|	diff2 \|	blob \| history
zebra/zebra_rib.c	patch \|	diff1 \|	diff2 \|	blob \| history