Merge pull request #1819 from donaldsharp/static_stuff

author Renato Westphal <renato@openbsd.org>

Wed, 14 Mar 2018 14:26:20 +0000 (11:26 -0300)

committer GitHub <noreply@github.com>

Wed, 14 Mar 2018 14:26:20 +0000 (11:26 -0300)
author Renato Westphal <renato@openbsd.org>
Wed, 14 Mar 2018 14:26:20 +0000 (11:26 -0300)
committer GitHub <noreply@github.com>
Wed, 14 Mar 2018 14:26:20 +0000 (11:26 -0300)
diff --cc zebra/rib.h
Simple merge
diff --cc zebra/zebra_vrf.c
Simple merge
diff --cc zebra/zebra_vty.c
Simple merge
author	Renato Westphal <renato@openbsd.org>
	Wed, 14 Mar 2018 14:26:20 +0000 (11:26 -0300)
committer	GitHub <noreply@github.com>
	Wed, 14 Mar 2018 14:26:20 +0000 (11:26 -0300)
		1	2
zebra/rib.h	patch \|	diff1 \|	diff2 \|	blob \| history
zebra/zebra_vrf.c	patch \|	diff1 \|	diff2 \|	blob \| history
zebra/zebra_vty.c	patch \|	diff1 \|	diff2 \|	blob \| history