Merge pull request #2934 from LabNConsulting/working/master/rfapi_topotest_support

author David Lamparter <equinox@diac24.net>

Tue, 4 Sep 2018 15:42:32 +0000 (17:42 +0200)

committer GitHub <noreply@github.com>

Tue, 4 Sep 2018 15:42:32 +0000 (17:42 +0200)
author David Lamparter <equinox@diac24.net>
Tue, 4 Sep 2018 15:42:32 +0000 (17:42 +0200)
committer GitHub <noreply@github.com>
Tue, 4 Sep 2018 15:42:32 +0000 (17:42 +0200)
diff --cc bgpd/rfapi/rfapi.c
Simple merge
diff --cc bgpd/rfp-example/librfp/rfp_example.c
Simple merge
author	David Lamparter <equinox@diac24.net>
	Tue, 4 Sep 2018 15:42:32 +0000 (17:42 +0200)
committer	GitHub <noreply@github.com>
	Tue, 4 Sep 2018 15:42:32 +0000 (17:42 +0200)
		1	2
bgpd/rfapi/rfapi.c	patch \|	diff1 \|	diff2 \|	blob \| history
bgpd/rfp-example/librfp/rfp_example.c	patch \|	diff1 \|	diff2 \|	blob \| history