Merge pull request #3860 from AkhileshSamineni/show_bgp_af_neigh_fix

author David Lamparter <equinox@diac24.net>

Mon, 11 Mar 2019 18:43:05 +0000 (19:43 +0100)

committer GitHub <noreply@github.com>

Mon, 11 Mar 2019 18:43:05 +0000 (19:43 +0100)
author David Lamparter <equinox@diac24.net>
Mon, 11 Mar 2019 18:43:05 +0000 (19:43 +0100)
committer GitHub <noreply@github.com>
Mon, 11 Mar 2019 18:43:05 +0000 (19:43 +0100)
diff --cc bgpd/bgp_vty.c
Simple merge
diff --cc bgpd/bgpd.h
Simple merge
author	David Lamparter <equinox@diac24.net>
	Mon, 11 Mar 2019 18:43:05 +0000 (19:43 +0100)
committer	GitHub <noreply@github.com>
	Mon, 11 Mar 2019 18:43:05 +0000 (19:43 +0100)
		1	2
bgpd/bgp_vty.c	patch \|	diff1 \|	diff2 \|	blob \| history
bgpd/bgpd.h	patch \|	diff1 \|	diff2 \|	blob \| history