Merge pull request #3020 from donaldsharp/global_5549

author Russ White <russ@riw.us>

Mon, 24 Sep 2018 13:55:50 +0000 (09:55 -0400)

committer GitHub <noreply@github.com>

Mon, 24 Sep 2018 13:55:50 +0000 (09:55 -0400)
author Russ White <russ@riw.us>
Mon, 24 Sep 2018 13:55:50 +0000 (09:55 -0400)
committer GitHub <noreply@github.com>
Mon, 24 Sep 2018 13:55:50 +0000 (09:55 -0400)
diff --cc bgpd/bgp_nht.c
Simple merge
diff --cc zebra/interface.c
Simple merge
diff --cc zebra/interface.h
Simple merge
author	Russ White <russ@riw.us>
	Mon, 24 Sep 2018 13:55:50 +0000 (09:55 -0400)
committer	GitHub <noreply@github.com>
	Mon, 24 Sep 2018 13:55:50 +0000 (09:55 -0400)
		1	2
bgpd/bgp_nht.c	patch \|	diff1 \|	diff2 \|	blob \| history
zebra/interface.c	patch \|	diff1 \|	diff2 \|	blob \| history
zebra/interface.h	patch \|	diff1 \|	diff2 \|	blob \| history