Merge pull request #4564 from pguibert6WIND/misc_vrf_update_name

author Russ White <russ@riw.us>

Tue, 17 Sep 2019 11:22:22 +0000 (07:22 -0400)

committer GitHub <noreply@github.com>

Tue, 17 Sep 2019 11:22:22 +0000 (07:22 -0400)
author Russ White <russ@riw.us>
Tue, 17 Sep 2019 11:22:22 +0000 (07:22 -0400)
committer GitHub <noreply@github.com>
Tue, 17 Sep 2019 11:22:22 +0000 (07:22 -0400)
diff --cc bfdd/bfd.c
Simple merge
diff --cc lib/vrf.c
Simple merge
diff --cc ospfd/ospfd.c
Simple merge
diff --cc ripd/ripd.c
Simple merge
diff --cc ripngd/ripngd.c
Simple merge
author	Russ White <russ@riw.us>
	Tue, 17 Sep 2019 11:22:22 +0000 (07:22 -0400)
committer	GitHub <noreply@github.com>
	Tue, 17 Sep 2019 11:22:22 +0000 (07:22 -0400)
		1	2
bfdd/bfd.c	patch \|	diff1 \|	diff2 \|	blob \| history
lib/vrf.c	patch \|	diff1 \|	diff2 \|	blob \| history
ospfd/ospfd.c	patch \|	diff1 \|	diff2 \|	blob \| history
ripd/ripd.c	patch \|	diff1 \|	diff2 \|	blob \| history
ripngd/ripngd.c	patch \|	diff1 \|	diff2 \|	blob \| history