proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-06-12 22:47:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/cmaster' into cmaster-next

Browse Source
This commit is contained in:
Donald Sharp 2016-08-17 20:52:04 -04:00
commit ac01cff9ec
4 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bgpd/bgp_vty.c
View File

@ -13600,7 +13600,7 @@ bgp_show_peer_group (struct vty *vty, struct bgp *bgp,
}
if (type == show_peer_group && ! find)
vty_out (vty, "%% No such peer-groupr%s", VTY_NEWLINE);
vty_out (vty, "%% No such peer-group%s", VTY_NEWLINE);
return CMD_SUCCESS;
}

4
bgpd/bgpd.c
View File

@ -6727,7 +6727,9 @@ bgp_config_write_peer_af (struct vty *vty, struct bgp *bgp,
{
if (bgp_flag_check (bgp, BGP_FLAG_NO_DEFAULT_IPV4))
{
vty_out (vty, " neighbor %s activate%s", addr, VTY_NEWLINE);
afi_header_vty_out(vty, afi, safi, write,
" neighbor %s activate%s",
addr, VTY_NEWLINE);
}
}
else

1
cumulus/etc/quagga/Quagga.conf
View File

@ -1,3 +1,2 @@
log file /var/log/quagga/quagga.log
log timestamp precision 6

5
vtysh/vtysh_main.c
View File

@ -415,7 +415,10 @@ main (int argc, char **argv, char **env)
if (vtysh_connect_all (daemon_name) <= 0)
{
fprintf(stderr, "Exiting: failed to connect to any daemons.\n");
exit(1);
if (no_error)
exit(0);
else
exit(1);
}
if (inputfile)