]> git.puffer.fish Git - mirror/frr.git/commit
Merge branch 'cmaster-next' into vtysh-grammar
authorQuentin Young <qlyoung@cumulusnetworks.com>
Thu, 3 Nov 2016 20:43:41 +0000 (20:43 +0000)
committerQuentin Young <qlyoung@cumulusnetworks.com>
Thu, 3 Nov 2016 20:43:41 +0000 (20:43 +0000)
commit476e95e3f365962f5d74d09774b777477d2f539a
treedeafe9c81974cd799f5986b2672422fb79fd22d5
parent34f1f6dc78ab1a8a5ee9c372d0a42fb15d3dc9a1
parent73ea75daa522a43ad0be9bff1f26a98bc2e105b0
Merge branch 'cmaster-next' into vtysh-grammar
bgpd/bgp_attr.c
bgpd/bgp_encap.c
bgpd/bgp_mplsvpn.c
bgpd/bgp_route.c
configure.ac
ospfd/ospf_ri.c