Merge pull request #4242 from donaldsharp/zebra_diet

author Renato Westphal <renato@opensourcerouting.org>

Fri, 10 May 2019 11:29:59 +0000 (08:29 -0300)

committer GitHub <noreply@github.com>

Fri, 10 May 2019 11:29:59 +0000 (08:29 -0300)
author Renato Westphal <renato@opensourcerouting.org>
Fri, 10 May 2019 11:29:59 +0000 (08:29 -0300)
committer GitHub <noreply@github.com>
Fri, 10 May 2019 11:29:59 +0000 (08:29 -0300)
diff --cc zebra/zebra_rib.c
Simple merge
diff --cc zebra/zebra_vrf.c
Simple merge
author	Renato Westphal <renato@opensourcerouting.org>
	Fri, 10 May 2019 11:29:59 +0000 (08:29 -0300)
committer	GitHub <noreply@github.com>
	Fri, 10 May 2019 11:29:59 +0000 (08:29 -0300)
		1	2
zebra/zebra_rib.c	patch \|	diff1 \|	diff2 \|	blob \| history
zebra/zebra_vrf.c	patch \|	diff1 \|	diff2 \|	blob \| history