]> git.proxmox.com Git - mirror_frr.git/commit
Merge remote-tracking 'frr/master' into SR-Routing
authorOlivier Dugeon <olivier.dugeon@orange.com>
Tue, 30 Jan 2018 10:43:25 +0000 (11:43 +0100)
committerOlivier Dugeon <olivier.dugeon@orange.com>
Tue, 30 Jan 2018 10:43:25 +0000 (11:43 +0100)
commitdab8b7a81c42c62a3effbcf157ff6a125871792c
treeb6d84054818466bd1ba72ad401272e668cb6b07d
parentc97dbe20a19a43dce7a1cb37cf96b2b3d66d77ca
parent15fa114fedcdb94f1de8d18b84bba6e16007e74b
Merge remote-tracking 'frr/master' into SR-Routing
doc/ospfd.texi
lib/mpls.h
ospfd/ospf_opaque.c
ospfd/ospfd.c