diff options
| author | Daniel Walton <dwalton@cumulusnetworks.com> | 2017-06-30 19:52:56 +0200 |
|---|---|---|
| committer | Daniel Walton <dwalton@cumulusnetworks.com> | 2017-06-30 19:52:56 +0200 |
| commit | 1161690b93b48fbd07f4ee25c1261574db8d71c5 (patch) | |
| tree | 7ffbe5c3b333b1fe0b8a3f042d8b1af602d48019 /bgpd/bgp_route.h | |
| parent | bgpd: Make SAFI-1 and SAFI-4 use the same table (diff) | |
| parent | Merge pull request #740 from donaldsharp/ospf_commands (diff) | |
| download | frr-1161690b93b48fbd07f4ee25c1261574db8d71c5.tar.xz frr-1161690b93b48fbd07f4ee25c1261574db8d71c5.zip | |
Merge branch 'master' of https://github.com/dwalton76/frr into bgpd-ipv4-plus-label-misc3
Conflicts:
bgpd/bgp_route.c
Diffstat (limited to 'bgpd/bgp_route.h')
| -rw-r--r-- | bgpd/bgp_route.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/bgpd/bgp_route.h b/bgpd/bgp_route.h index 763553b55..0c77cc1ee 100644 --- a/bgpd/bgp_route.h +++ b/bgpd/bgp_route.h @@ -54,9 +54,9 @@ enum bgp_show_type #define BGP_SHOW_SCODE_HEADER "Status codes: s suppressed, d damped, "\ "h history, * valid, > best, = multipath,%s"\ - " i internal, r RIB-failure, S Stale, R Removed%s" -#define BGP_SHOW_OCODE_HEADER "Origin codes: i - IGP, e - EGP, ? - incomplete%s%s" -#define BGP_SHOW_HEADER " Network Next Hop Metric LocPrf Weight Path%s" + " i internal, r RIB-failure, S Stale, R Removed" +#define BGP_SHOW_OCODE_HEADER "Origin codes: i - IGP, e - EGP, ? - incomplete%s" +#define BGP_SHOW_HEADER " Network Next Hop Metric LocPrf Weight Path" /* Ancillary information to struct bgp_info, * used for uncommonly used data (aggregation, MPLS, etc.) |