Merge pull request #10179 from patrasar/pimv6_northbound

author David Lamparter <equinox@opensourcerouting.org>

Mon, 17 Jan 2022 12:23:21 +0000 (13:23 +0100)

committer GitHub <noreply@github.com>

Mon, 17 Jan 2022 12:23:21 +0000 (13:23 +0100)
author David Lamparter <equinox@opensourcerouting.org>
Mon, 17 Jan 2022 12:23:21 +0000 (13:23 +0100)
committer GitHub <noreply@github.com>
Mon, 17 Jan 2022 12:23:21 +0000 (13:23 +0100)
diff --cc pimd/pim_cmd.c
Simple merge
diff --cc pimd/pim_nb_config.c
Simple merge
author	David Lamparter <equinox@opensourcerouting.org>
	Mon, 17 Jan 2022 12:23:21 +0000 (13:23 +0100)
committer	GitHub <noreply@github.com>
	Mon, 17 Jan 2022 12:23:21 +0000 (13:23 +0100)
		1	2
pimd/pim_cmd.c	patch \|	diff1 \|	diff2 \|	blob \| history
pimd/pim_nb_config.c	patch \|	diff1 \|	diff2 \|	blob \| history