Merge pull request #10279 from SaiGomathiN/pim_intf

author David Lamparter <equinox@opensourcerouting.org>

Thu, 13 Jan 2022 15:13:54 +0000 (16:13 +0100)

committer GitHub <noreply@github.com>

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