Merge pull request #4040 from donaldsharp/pim_cleanup

author Jafar Al-Gharaibeh <Jafaral@users.noreply.github.com>

Mon, 1 Apr 2019 15:25:07 +0000 (10:25 -0500)

committer GitHub <noreply@github.com>

Mon, 1 Apr 2019 15:25:07 +0000 (10:25 -0500)
author Jafar Al-Gharaibeh <Jafaral@users.noreply.github.com>
Mon, 1 Apr 2019 15:25:07 +0000 (10:25 -0500)
committer GitHub <noreply@github.com>
Mon, 1 Apr 2019 15:25:07 +0000 (10:25 -0500)
diff --cc pimd/pim_rp.c
Simple merge
diff --cc pimd/pim_zebra.c
Simple merge
author	Jafar Al-Gharaibeh <Jafaral@users.noreply.github.com>
	Mon, 1 Apr 2019 15:25:07 +0000 (10:25 -0500)
committer	GitHub <noreply@github.com>
	Mon, 1 Apr 2019 15:25:07 +0000 (10:25 -0500)
		1	2
pimd/pim_rp.c	patch \|	diff1 \|	diff2 \|	blob \| history
pimd/pim_zebra.c	patch \|	diff1 \|	diff2 \|	blob \| history