]> git.puffer.fish Git - mirror/frr.git/commitdiff
Merge pull request #6016 from sarav511/ppend
authorDonald Sharp <sharpd@cumulusnetworks.com>
Thu, 15 Oct 2020 00:27:17 +0000 (20:27 -0400)
committerGitHub <noreply@github.com>
Thu, 15 Oct 2020 00:27:17 +0000 (20:27 -0400)
pimd: Handling prune received during join state and join received during prune pending

1  2 
pimd/pim_ifchannel.c

Simple merge