Merge pull request #10366 from AbhishekNR/mld_cli

author David Lamparter <equinox@opensourcerouting.org>

Mon, 28 Mar 2022 07:18:36 +0000 (09:18 +0200)

committer GitHub <noreply@github.com>

Mon, 28 Mar 2022 07:18:36 +0000 (09:18 +0200)
author David Lamparter <equinox@opensourcerouting.org>
Mon, 28 Mar 2022 07:18:36 +0000 (09:18 +0200)
committer GitHub <noreply@github.com>
Mon, 28 Mar 2022 07:18:36 +0000 (09:18 +0200)
diff --cc pimd/pim_iface.c
Simple merge
diff --cc pimd/pim_nb_config.c
Simple merge
author	David Lamparter <equinox@opensourcerouting.org>
	Mon, 28 Mar 2022 07:18:36 +0000 (09:18 +0200)
committer	GitHub <noreply@github.com>
	Mon, 28 Mar 2022 07:18:36 +0000 (09:18 +0200)
		1	2
pimd/pim_iface.c	patch \|	diff1 \|	diff2 \|	blob \| history
pimd/pim_nb_config.c	patch \|	diff1 \|	diff2 \|	blob \| history