Merge pull request #8250 from idryzhov/fix-nb-running-get-entry

author Renato Westphal <renato@opensourcerouting.org>

Wed, 24 Mar 2021 22:39:09 +0000 (19:39 -0300)

committer GitHub <noreply@github.com>

Wed, 24 Mar 2021 22:39:09 +0000 (19:39 -0300)
author Renato Westphal <renato@opensourcerouting.org>
Wed, 24 Mar 2021 22:39:09 +0000 (19:39 -0300)
committer GitHub <noreply@github.com>
Wed, 24 Mar 2021 22:39:09 +0000 (19:39 -0300)
diff --cc isisd/isis_nb_config.c
Simple merge
diff --cc zebra/zebra_nb.h
Simple merge
author	Renato Westphal <renato@opensourcerouting.org>
	Wed, 24 Mar 2021 22:39:09 +0000 (19:39 -0300)
committer	GitHub <noreply@github.com>
	Wed, 24 Mar 2021 22:39:09 +0000 (19:39 -0300)
		1	2
isisd/isis_nb_config.c	patch \|	diff1 \|	diff2 \|	blob \| history
zebra/zebra_nb.h	patch \|	diff1 \|	diff2 \|	blob \| history