Merge pull request #7300 from sworleys/EVPN-RType-NUMs

author Patrick Ruddy <pat@voltanet.io>

Tue, 20 Oct 2020 10:05:31 +0000 (11:05 +0100)

committer GitHub <noreply@github.com>

Tue, 20 Oct 2020 10:05:31 +0000 (11:05 +0100)
author Patrick Ruddy <pat@voltanet.io>
Tue, 20 Oct 2020 10:05:31 +0000 (11:05 +0100)
committer GitHub <noreply@github.com>
Tue, 20 Oct 2020 10:05:31 +0000 (11:05 +0100)
diff --cc bgpd/bgp_evpn_vty.c
Simple merge
diff --cc bgpd/bgp_routemap.c
Simple merge
author	Patrick Ruddy <pat@voltanet.io>
	Tue, 20 Oct 2020 10:05:31 +0000 (11:05 +0100)
committer	GitHub <noreply@github.com>
	Tue, 20 Oct 2020 10:05:31 +0000 (11:05 +0100)
		1	2
bgpd/bgp_evpn_vty.c	patch \|	diff1 \|	diff2 \|	blob \| history
bgpd/bgp_routemap.c	patch \|	diff1 \|	diff2 \|	blob \| history