]> git.proxmox.com Git - mirror_frr.git/commit
Merge branch 'stable/3.0'
authorDavid Lamparter <equinox@opensourcerouting.org>
Tue, 6 Jun 2017 15:37:41 +0000 (17:37 +0200)
committerDavid Lamparter <equinox@opensourcerouting.org>
Tue, 6 Jun 2017 15:37:41 +0000 (17:37 +0200)
commit326452238a0f2610b778678fd639730c7bdd40fb
treefe95eb5109b8c696274e873b4922fc5562c6a64c
parentfa135ba00813984f1f0d601b8f7930d4efaefe07
parentf87b96392c19d18342f0f986858409b10875fcbd
Merge branch 'stable/3.0'

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
bgpd/bgp_vty.c
ospf6d/ospf6_area.c
ospfd/ospf_vty.c
pimd/pim_ifchannel.c
pimd/pim_ifchannel.h
pimd/pim_join.c
pimd/pim_rpf.c
pimd/pim_upstream.c
vtysh/vtysh.c