Merge pull request #4027 from pguibert6WIND/fix_interface_rtadv

author David Lamparter <equinox@opensourcerouting.org>

Tue, 14 May 2019 13:53:04 +0000 (15:53 +0200)

committer GitHub <noreply@github.com>

Tue, 14 May 2019 13:53:04 +0000 (15:53 +0200)
author David Lamparter <equinox@opensourcerouting.org>
Tue, 14 May 2019 13:53:04 +0000 (15:53 +0200)
committer GitHub <noreply@github.com>
Tue, 14 May 2019 13:53:04 +0000 (15:53 +0200)
diff --cc zebra/zebra_router.h
Simple merge
diff --cc zebra/zebra_vrf.c
Simple merge
author	David Lamparter <equinox@opensourcerouting.org>
	Tue, 14 May 2019 13:53:04 +0000 (15:53 +0200)
committer	GitHub <noreply@github.com>
	Tue, 14 May 2019 13:53:04 +0000 (15:53 +0200)
		1	2
zebra/zebra_router.h	patch \|	diff1 \|	diff2 \|	blob \| history
zebra/zebra_vrf.c	patch \|	diff1 \|	diff2 \|	blob \| history