]> git.proxmox.com Git - mirror_frr.git/commitdiff
projects / mirror_frr.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a709012 604bbac)
Merge branch 'frr/pull/546' ("bgpd: resolve issue with sending vpn labels")
authorDavid Lamparter <equinox@opensourcerouting.org>
Thu, 18 May 2017 09:31:05 +0000 (11:31 +0200)
committerDavid Lamparter <equinox@opensourcerouting.org>
Thu, 18 May 2017 09:31:05 +0000 (11:31 +0200)
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
1  2 
bgpd/bgp_updgrp_packet.c patch | diff1 | diff2 | blob | history

diff --cc bgpd/bgp_updgrp_packet.c
Simple merge
FRRouting mirror