Merge pull request #5015 from pguibert6WIND/rpki_vrf_encapsulation

author Quentin Young <qlyoung@users.noreply.github.com>

Tue, 14 Jul 2020 15:52:47 +0000 (11:52 -0400)

committer GitHub <noreply@github.com>

Tue, 14 Jul 2020 15:52:47 +0000 (11:52 -0400)
author Quentin Young <qlyoung@users.noreply.github.com>
Tue, 14 Jul 2020 15:52:47 +0000 (11:52 -0400)
committer GitHub <noreply@github.com>
Tue, 14 Jul 2020 15:52:47 +0000 (11:52 -0400)
diff --cc bgpd/bgpd.h
Simple merge
diff --cc vtysh/vtysh.c
Simple merge
diff --cc vtysh/vtysh_config.c
Simple merge
author	Quentin Young <qlyoung@users.noreply.github.com>
	Tue, 14 Jul 2020 15:52:47 +0000 (11:52 -0400)
committer	GitHub <noreply@github.com>
	Tue, 14 Jul 2020 15:52:47 +0000 (11:52 -0400)
		1	2
bgpd/bgpd.h	patch \|	diff1 \|	diff2 \|	blob \| history
vtysh/vtysh.c	patch \|	diff1 \|	diff2 \|	blob \| history
vtysh/vtysh_config.c	patch \|	diff1 \|	diff2 \|	blob \| history