]> git.proxmox.com Git - mirror_frr.git/commitdiff
Merge branch 'frr/pull/536'
authorDavid Lamparter <equinox@opensourcerouting.org>
Thu, 18 May 2017 09:30:04 +0000 (11:30 +0200)
committerDavid Lamparter <equinox@opensourcerouting.org>
Thu, 18 May 2017 09:30:04 +0000 (11:30 +0200)
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
1  2 
bgpd/bgp_attr.c
bgpd/bgp_attr.h
bgpd/bgp_updgrp_packet.c

diff --cc bgpd/bgp_attr.c
Simple merge
diff --cc bgpd/bgp_attr.h
Simple merge
Simple merge