Merge pull request #1236 from donaldsharp/interface_startup

author Renato Westphal <renato@openbsd.org>

Fri, 29 Sep 2017 01:04:02 +0000 (22:04 -0300)

committer GitHub <noreply@github.com>

Fri, 29 Sep 2017 01:04:02 +0000 (22:04 -0300)
author Renato Westphal <renato@openbsd.org>
Fri, 29 Sep 2017 01:04:02 +0000 (22:04 -0300)
committer GitHub <noreply@github.com>
Fri, 29 Sep 2017 01:04:02 +0000 (22:04 -0300)
diff --cc zebra/rib.h
Simple merge
diff --cc zebra/zebra_rib.c
Simple merge
author	Renato Westphal <renato@openbsd.org>
	Fri, 29 Sep 2017 01:04:02 +0000 (22:04 -0300)
committer	GitHub <noreply@github.com>
	Fri, 29 Sep 2017 01:04:02 +0000 (22:04 -0300)
		1	2
zebra/rib.h	patch \|	diff1 \|	diff2 \|	blob \| history
zebra/zebra_rib.c	patch \|	diff1 \|	diff2 \|	blob \| history