Merge pull request #4892 from pguibert6WIND/nhtresolvedefaultvrf

author Donald Sharp <sharpd@cumulusnetworks.com>

Tue, 3 Sep 2019 19:40:43 +0000 (15:40 -0400)

committer GitHub <noreply@github.com>

Tue, 3 Sep 2019 19:40:43 +0000 (15:40 -0400)
author Donald Sharp <sharpd@cumulusnetworks.com>
Tue, 3 Sep 2019 19:40:43 +0000 (15:40 -0400)
committer GitHub <noreply@github.com>
Tue, 3 Sep 2019 19:40:43 +0000 (15:40 -0400)
diff --cc zebra/zebra_nhg.c
Simple merge
diff --cc zebra/zebra_vty.c
Simple merge
author	Donald Sharp <sharpd@cumulusnetworks.com>
	Tue, 3 Sep 2019 19:40:43 +0000 (15:40 -0400)
committer	GitHub <noreply@github.com>
	Tue, 3 Sep 2019 19:40:43 +0000 (15:40 -0400)
		1	2
zebra/zebra_nhg.c	patch \|	diff1 \|	diff2 \|	blob \| history
zebra/zebra_vty.c	patch \|	diff1 \|	diff2 \|	blob \| history