Merge pull request #6126 from sarav511/watermark

author Donald Sharp <sharpd@cumulusnetworks.com>

Tue, 21 Apr 2020 20:14:21 +0000 (16:14 -0400)

committer GitHub <noreply@github.com>

Tue, 21 Apr 2020 20:14:21 +0000 (16:14 -0400)
author Donald Sharp <sharpd@cumulusnetworks.com>
Tue, 21 Apr 2020 20:14:21 +0000 (16:14 -0400)
committer GitHub <noreply@github.com>
Tue, 21 Apr 2020 20:14:21 +0000 (16:14 -0400)
diff --cc doc/user/pim.rst
Simple merge
diff --cc pimd/pim_cmd.c
Simple merge
author	Donald Sharp <sharpd@cumulusnetworks.com>
	Tue, 21 Apr 2020 20:14:21 +0000 (16:14 -0400)
committer	GitHub <noreply@github.com>
	Tue, 21 Apr 2020 20:14:21 +0000 (16:14 -0400)
		1	2
doc/user/pim.rst	patch \|	diff1 \|	diff2 \|	blob \| history
pimd/pim_cmd.c	patch \|	diff1 \|	diff2 \|	blob \| history