]> git.puffer.fish Git - mirror/frr.git/commit
pimd: fix conflicts with #10706 pim6-testing-20220430
authorDavid Lamparter <equinox@opensourcerouting.org>
Fri, 8 Apr 2022 08:23:05 +0000 (10:23 +0200)
committerDavid Lamparter <equinox@opensourcerouting.org>
Sat, 30 Apr 2022 13:24:31 +0000 (15:24 +0200)
commit2419d006e1dc68b5fb7efae39fdda7d21edbcebe
tree0f9da9f4140def47ee65e313dfdf6975cfb5393b
parent8768be17f3c761d564154223482b85444d76e40b
pimd: fix conflicts with #10706

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
pimd/pim_nht.c