Merge pull request #5427 from liam-mcb/igmp-join-any

author Donald Sharp <sharpd@cumulusnetworks.com>

Mon, 16 Dec 2019 12:47:41 +0000 (07:47 -0500)

committer GitHub <noreply@github.com>

Mon, 16 Dec 2019 12:47:41 +0000 (07:47 -0500)
author Donald Sharp <sharpd@cumulusnetworks.com>
Mon, 16 Dec 2019 12:47:41 +0000 (07:47 -0500)
committer GitHub <noreply@github.com>
Mon, 16 Dec 2019 12:47:41 +0000 (07:47 -0500)
diff --cc doc/user/pim.rst
Simple merge
diff --cc pimd/pim_cmd.c
Simple merge
author	Donald Sharp <sharpd@cumulusnetworks.com>
	Mon, 16 Dec 2019 12:47:41 +0000 (07:47 -0500)
committer	GitHub <noreply@github.com>
	Mon, 16 Dec 2019 12:47:41 +0000 (07:47 -0500)
		1	2
doc/user/pim.rst	patch \|	diff1 \|	diff2 \|	blob \| history
pimd/pim_cmd.c	patch \|	diff1 \|	diff2 \|	blob \| history