Merge pull request #5901 from mjstapp/backup_nh_prep

author Stephen Worley <sworley@cumulusnetworks.com>

Mon, 30 Mar 2020 14:26:17 +0000 (10:26 -0400)

committer GitHub <noreply@github.com>

Mon, 30 Mar 2020 14:26:17 +0000 (10:26 -0400)
author Stephen Worley <sworley@cumulusnetworks.com>
Mon, 30 Mar 2020 14:26:17 +0000 (10:26 -0400)
committer GitHub <noreply@github.com>
Mon, 30 Mar 2020 14:26:17 +0000 (10:26 -0400)
diff --cc lib/nexthop.h
Simple merge
diff --cc zebra/zebra_rib.c
Simple merge
author	Stephen Worley <sworley@cumulusnetworks.com>
	Mon, 30 Mar 2020 14:26:17 +0000 (10:26 -0400)
committer	GitHub <noreply@github.com>
	Mon, 30 Mar 2020 14:26:17 +0000 (10:26 -0400)
		1	2
lib/nexthop.h	patch \|	diff1 \|	diff2 \|	blob \| history
zebra/zebra_rib.c	patch \|	diff1 \|	diff2 \|	blob \| history