Merge pull request #2635 from donaldsharp/more_pim_neighbor

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

Thu, 19 Jul 2018 15:47:10 +0000 (10:47 -0500)

committer GitHub <noreply@github.com>

Thu, 19 Jul 2018 15:47:10 +0000 (10:47 -0500)
author Jafar Al-Gharaibeh <Jafaral@users.noreply.github.com>
Thu, 19 Jul 2018 15:47:10 +0000 (10:47 -0500)
committer GitHub <noreply@github.com>
Thu, 19 Jul 2018 15:47:10 +0000 (10:47 -0500)
diff --cc pimd/pim_nht.c
Simple merge
diff --cc pimd/pim_rp.c
Simple merge
author	Jafar Al-Gharaibeh <Jafaral@users.noreply.github.com>
	Thu, 19 Jul 2018 15:47:10 +0000 (10:47 -0500)
committer	GitHub <noreply@github.com>
	Thu, 19 Jul 2018 15:47:10 +0000 (10:47 -0500)
		1	2
pimd/pim_nht.c	patch \|	diff1 \|	diff2 \|	blob \| history
pimd/pim_rp.c	patch \|	diff1 \|	diff2 \|	blob \| history