Merge pull request #7184 from opensourcerouting/anycast-sids-v4

author Olivier Dugeon <olivier.dugeon@orange.com>

Fri, 23 Oct 2020 19:03:55 +0000 (21:03 +0200)

committer GitHub <noreply@github.com>

Fri, 23 Oct 2020 19:03:55 +0000 (21:03 +0200)
author Olivier Dugeon <olivier.dugeon@orange.com>
Fri, 23 Oct 2020 19:03:55 +0000 (21:03 +0200)
committer GitHub <noreply@github.com>
Fri, 23 Oct 2020 19:03:55 +0000 (21:03 +0200)
diff --cc isisd/isis_nb_config.c
Simple merge
diff --cc isisd/isis_sr.c
Simple merge
author	Olivier Dugeon <olivier.dugeon@orange.com>
	Fri, 23 Oct 2020 19:03:55 +0000 (21:03 +0200)
committer	GitHub <noreply@github.com>
	Fri, 23 Oct 2020 19:03:55 +0000 (21:03 +0200)
		1	2
isisd/isis_nb_config.c	patch \|	diff1 \|	diff2 \|	blob \| history
isisd/isis_sr.c	patch \|	diff1 \|	diff2 \|	blob \| history