]> git.puffer.fish Git - mirror/frr.git/commitdiff
Merge branch 'frr/pull/243' ("Pim jp agg")
authorDavid Lamparter <equinox@opensourcerouting.org>
Tue, 7 Mar 2017 15:42:20 +0000 (16:42 +0100)
committerDavid Lamparter <equinox@opensourcerouting.org>
Tue, 7 Mar 2017 15:42:20 +0000 (16:42 +0100)
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
1  2 
pimd/pim_cmd.c
pimd/pim_iface.c

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