Merge pull request #5801 from donaldsharp/bgp_peer_sort

author Sri Mohana Singamsetty <srimohans@gmail.com>

Tue, 18 Feb 2020 05:39:37 +0000 (21:39 -0800)

committer GitHub <noreply@github.com>

Tue, 18 Feb 2020 05:39:37 +0000 (21:39 -0800)
author Sri Mohana Singamsetty <srimohans@gmail.com>
Tue, 18 Feb 2020 05:39:37 +0000 (21:39 -0800)
committer GitHub <noreply@github.com>
Tue, 18 Feb 2020 05:39:37 +0000 (21:39 -0800)
diff --cc bgpd/bgp_route.c
Simple merge
diff --cc bgpd/bgpd.h
Simple merge
author	Sri Mohana Singamsetty <srimohans@gmail.com>
	Tue, 18 Feb 2020 05:39:37 +0000 (21:39 -0800)
committer	GitHub <noreply@github.com>
	Tue, 18 Feb 2020 05:39:37 +0000 (21:39 -0800)
		1	2
bgpd/bgp_route.c	patch \|	diff1 \|	diff2 \|	blob \| history
bgpd/bgpd.h	patch \|	diff1 \|	diff2 \|	blob \| history