Merge pull request #11980 from isabelladeleon12/set_overload_startup

author Russ White <russ@riw.us>

Thu, 13 Oct 2022 14:59:24 +0000 (10:59 -0400)

committer GitHub <noreply@github.com>

Thu, 13 Oct 2022 14:59:24 +0000 (10:59 -0400)
author Russ White <russ@riw.us>
Thu, 13 Oct 2022 14:59:24 +0000 (10:59 -0400)
committer GitHub <noreply@github.com>
Thu, 13 Oct 2022 14:59:24 +0000 (10:59 -0400)
diff --cc configure.ac
Simple merge
diff --cc isisd/isis_nb_config.c
Simple merge
diff --cc isisd/isisd.c
Simple merge
diff --cc isisd/isisd.h
Simple merge
author	Russ White <russ@riw.us>
	Thu, 13 Oct 2022 14:59:24 +0000 (10:59 -0400)
committer	GitHub <noreply@github.com>
	Thu, 13 Oct 2022 14:59:24 +0000 (10:59 -0400)
		1	2
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history
isisd/isis_nb_config.c	patch \|	diff1 \|	diff2 \|	blob \| history
isisd/isisd.c	patch \|	diff1 \|	diff2 \|	blob \| history
isisd/isisd.h	patch \|	diff1 \|	diff2 \|	blob \| history