Merge pull request #3102 from ton31337/feature/match_blackhole_nexthops

author David Lamparter <equinox@diac24.net>

Tue, 2 Oct 2018 09:29:59 +0000 (11:29 +0200)

committer GitHub <noreply@github.com>

Tue, 2 Oct 2018 09:29:59 +0000 (11:29 +0200)
author David Lamparter <equinox@diac24.net>
Tue, 2 Oct 2018 09:29:59 +0000 (11:29 +0200)
committer GitHub <noreply@github.com>
Tue, 2 Oct 2018 09:29:59 +0000 (11:29 +0200)
diff --cc bgpd/bgp_routemap.c
Simple merge
diff --cc lib/routemap.c
Simple merge
diff --cc lib/routemap.h
Simple merge
author	David Lamparter <equinox@diac24.net>
	Tue, 2 Oct 2018 09:29:59 +0000 (11:29 +0200)
committer	GitHub <noreply@github.com>
	Tue, 2 Oct 2018 09:29:59 +0000 (11:29 +0200)
		1	2
bgpd/bgp_routemap.c	patch \|	diff1 \|	diff2 \|	blob \| history
lib/routemap.c	patch \|	diff1 \|	diff2 \|	blob \| history
lib/routemap.h	patch \|	diff1 \|	diff2 \|	blob \| history