Merge pull request #3698 from donaldsharp/netlink_is_serious_business

author Renato Westphal <renato@openbsd.org>

Tue, 5 Feb 2019 13:52:33 +0000 (11:52 -0200)

committer GitHub <noreply@github.com>

Tue, 5 Feb 2019 13:52:33 +0000 (11:52 -0200)
author Renato Westphal <renato@openbsd.org>
Tue, 5 Feb 2019 13:52:33 +0000 (11:52 -0200)
committer GitHub <noreply@github.com>
Tue, 5 Feb 2019 13:52:33 +0000 (11:52 -0200)
diff --cc zebra/rt_netlink.c
Simple merge
diff --cc zebra/zebra_vty.c
Simple merge
author	Renato Westphal <renato@openbsd.org>
	Tue, 5 Feb 2019 13:52:33 +0000 (11:52 -0200)
committer	GitHub <noreply@github.com>
	Tue, 5 Feb 2019 13:52:33 +0000 (11:52 -0200)
		1	2
zebra/rt_netlink.c	patch \|	diff1 \|	diff2 \|	blob \| history
zebra/zebra_vty.c	patch \|	diff1 \|	diff2 \|	blob \| history