Merge pull request #3947 from dslicenc/bgpd-redist-connected-vrf

author Lou Berger <lberger@labn.net>

Sun, 17 Mar 2019 18:26:44 +0000 (14:26 -0400)

committer GitHub <noreply@github.com>

Sun, 17 Mar 2019 18:26:44 +0000 (14:26 -0400)
author Lou Berger <lberger@labn.net>
Sun, 17 Mar 2019 18:26:44 +0000 (14:26 -0400)
committer GitHub <noreply@github.com>
Sun, 17 Mar 2019 18:26:44 +0000 (14:26 -0400)
diff --cc bgpd/bgp_vty.c
Simple merge
diff --cc bgpd/bgpd.h
Simple merge
author	Lou Berger <lberger@labn.net>
	Sun, 17 Mar 2019 18:26:44 +0000 (14:26 -0400)
committer	GitHub <noreply@github.com>
	Sun, 17 Mar 2019 18:26:44 +0000 (14:26 -0400)
		1	2
bgpd/bgp_vty.c	patch \|	diff1 \|	diff2 \|	blob \| history
bgpd/bgpd.h	patch \|	diff1 \|	diff2 \|	blob \| history