]> git.proxmox.com Git - mirror_frr.git/commitdiff
Merge pull request #6114 from rgirada/frr-static
authorQuentin Young <qlyoung@users.noreply.github.com>
Mon, 6 Jul 2020 17:04:43 +0000 (13:04 -0400)
committerGitHub <noreply@github.com>
Mon, 6 Jul 2020 17:04:43 +0000 (13:04 -0400)
pimd: Providing json support for few pim commands

1  2 
doc/user/pim.rst
pimd/pim_cmd.c

Simple merge
diff --cc pimd/pim_cmd.c
Simple merge