]> git.proxmox.com Git - mirror_frr.git/commit
Merge branch 'stable/3.0'
authorDavid Lamparter <equinox@opensourcerouting.org>
Thu, 18 May 2017 12:14:00 +0000 (14:14 +0200)
committerDavid Lamparter <equinox@opensourcerouting.org>
Thu, 18 May 2017 12:14:00 +0000 (14:14 +0200)
commitfa84d1932b0da93815a6292d19af57acd81c7504
tree2b403f19ba362b74cce3d7687da1dedb00efc617
parente2f30ad1c2087caf09cf163c7688750995733e04
parent05220b6d5d9d3781654e3f36a2dbac076d709059
Merge branch 'stable/3.0'

Conflicts:
ldpd/lde.c
zebra/label_manager.c

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
bgpd/bgp_zebra.c
ldpd/lde.c
lib/zclient.c
zebra/label_manager.c
zebra/label_manager.h
zebra/zserv.c