]> git.proxmox.com Git - mirror_frr.git/commitdiff
Merge pull request #10775 from opensourcerouting/pim6-mld-pr
authorDonald Sharp <donaldsharp72@gmail.com>
Tue, 17 May 2022 11:20:08 +0000 (07:20 -0400)
committerGitHub <noreply@github.com>
Tue, 17 May 2022 11:20:08 +0000 (07:20 -0400)
pim6d: MLD code

1  2 
doc/user/pimv6.rst
pimd/pim6_cmd.c
pimd/pim_iface.c
pimd/pim_iface.h
pimd/pim_instance.c
pimd/pim_nb_config.c
pimd/pim_vty.c
pimd/subdir.am

Simple merge
diff --cc pimd/pim6_cmd.c
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc pimd/pim_vty.c
Simple merge
diff --cc pimd/subdir.am
Simple merge