Merge pull request #5809 from donaldsharp/vrf_name

author Donatas Abraitis <donatas.abraitis@gmail.com>

Wed, 19 Feb 2020 13:23:32 +0000 (14:23 +0100)

committer GitHub <noreply@github.com>

Wed, 19 Feb 2020 13:23:32 +0000 (14:23 +0100)
author Donatas Abraitis <donatas.abraitis@gmail.com>
Wed, 19 Feb 2020 13:23:32 +0000 (14:23 +0100)
committer GitHub <noreply@github.com>
Wed, 19 Feb 2020 13:23:32 +0000 (14:23 +0100)
diff --cc bgpd/bgp_route.c
Simple merge
diff --cc bgpd/bgpd.c
Simple merge
diff --cc zebra/zapi_msg.c
Simple merge
author	Donatas Abraitis <donatas.abraitis@gmail.com>
	Wed, 19 Feb 2020 13:23:32 +0000 (14:23 +0100)
committer	GitHub <noreply@github.com>
	Wed, 19 Feb 2020 13:23:32 +0000 (14:23 +0100)
		1	2
bgpd/bgp_route.c	patch \|	diff1 \|	diff2 \|	blob \| history
bgpd/bgpd.c	patch \|	diff1 \|	diff2 \|	blob \| history
zebra/zapi_msg.c	patch \|	diff1 \|	diff2 \|	blob \| history