Merge pull request #2122 from donaldsharp/zebra_nhs

author Martin Winter <mwinter@opensourcerouting.org>

Wed, 8 Aug 2018 15:07:24 +0000 (08:07 -0700)

committer GitHub <noreply@github.com>

Wed, 8 Aug 2018 15:07:24 +0000 (08:07 -0700)
author Martin Winter <mwinter@opensourcerouting.org>
Wed, 8 Aug 2018 15:07:24 +0000 (08:07 -0700)
committer GitHub <noreply@github.com>
Wed, 8 Aug 2018 15:07:24 +0000 (08:07 -0700)
diff --cc lib/zebra.h
Simple merge
diff --cc tools/frr
Simple merge
diff --cc zebra/rt_netlink.c
Simple merge
author	Martin Winter <mwinter@opensourcerouting.org>
	Wed, 8 Aug 2018 15:07:24 +0000 (08:07 -0700)
committer	GitHub <noreply@github.com>
	Wed, 8 Aug 2018 15:07:24 +0000 (08:07 -0700)
		1	2
lib/zebra.h	patch \|	diff1 \|	diff2 \|	blob \| history
tools/frr	patch \|	diff1 \|	diff2 \|	blob \| history
zebra/rt_netlink.c	patch \|	diff1 \|	diff2 \|	blob \| history