]> git.proxmox.com Git - mirror_frr.git/commitdiff
Merge remote-tracking branch 'origin/cmaster' into cmaster-next
authorDonald Sharp <sharpd@cumulusnetworks.com>
Thu, 18 Aug 2016 00:52:04 +0000 (20:52 -0400)
committerDonald Sharp <sharpd@cumulusnetworks.com>
Thu, 18 Aug 2016 00:52:04 +0000 (20:52 -0400)
1  2 
bgpd/bgp_vty.c
bgpd/bgpd.c

diff --cc bgpd/bgp_vty.c
Simple merge
diff --cc bgpd/bgpd.c
Simple merge