Merge pull request #1474 from qlyoung/foreach_afi_safi

author Renato Westphal <renato@openbsd.org>

Wed, 22 Nov 2017 15:54:30 +0000 (13:54 -0200)

committer GitHub <noreply@github.com>

Wed, 22 Nov 2017 15:54:30 +0000 (13:54 -0200)
author Renato Westphal <renato@openbsd.org>
Wed, 22 Nov 2017 15:54:30 +0000 (13:54 -0200)
committer GitHub <noreply@github.com>
Wed, 22 Nov 2017 15:54:30 +0000 (13:54 -0200)
diff --cc bgpd/bgp_route.c
Simple merge
diff --cc bgpd/bgp_routemap.c
Simple merge
diff --cc bgpd/bgp_vty.c
Simple merge
author	Renato Westphal <renato@openbsd.org>
	Wed, 22 Nov 2017 15:54:30 +0000 (13:54 -0200)
committer	GitHub <noreply@github.com>
	Wed, 22 Nov 2017 15:54:30 +0000 (13:54 -0200)
		1	2
bgpd/bgp_route.c	patch \|	diff1 \|	diff2 \|	blob \| history
bgpd/bgp_routemap.c	patch \|	diff1 \|	diff2 \|	blob \| history
bgpd/bgp_vty.c	patch \|	diff1 \|	diff2 \|	blob \| history