]> git.puffer.fish Git - matthieu/frr.git/commitdiff
Merge pull request #8333 from mobash-rasool/pim-fixes-2
authorDonald Sharp <sharpd@cumulusnetworks.com>
Thu, 25 Mar 2021 14:19:12 +0000 (10:19 -0400)
committerGitHub <noreply@github.com>
Thu, 25 Mar 2021 14:19:12 +0000 (10:19 -0400)
pimd: Fix hold time related issues

1  2 
pimd/pim_nb_config.c

Simple merge