Merge pull request #5104 from opensourcerouting/route-map-nbv2

author Donald Sharp <sharpd@cumulusnetworks.com>

Wed, 5 Feb 2020 16:54:21 +0000 (11:54 -0500)

committer GitHub <noreply@github.com>

Wed, 5 Feb 2020 16:54:21 +0000 (11:54 -0500)
author Donald Sharp <sharpd@cumulusnetworks.com>
Wed, 5 Feb 2020 16:54:21 +0000 (11:54 -0500)
committer GitHub <noreply@github.com>
Wed, 5 Feb 2020 16:54:21 +0000 (11:54 -0500)
diff --cc bgpd/bgp_main.c
Simple merge
diff --cc lib/routemap.c
Simple merge
author	Donald Sharp <sharpd@cumulusnetworks.com>
	Wed, 5 Feb 2020 16:54:21 +0000 (11:54 -0500)
committer	GitHub <noreply@github.com>
	Wed, 5 Feb 2020 16:54:21 +0000 (11:54 -0500)
		1	2
bgpd/bgp_main.c	patch \|	diff1 \|	diff2 \|	blob \| history
lib/routemap.c	patch \|	diff1 \|	diff2 \|	blob \| history