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_attr.c | |
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_attr.c')
-rw-r--r-- | bgpd/bgp_attr.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/bgpd/bgp_attr.c b/bgpd/bgp_attr.c index 65d1b2155..33965a51f 100644 --- a/bgpd/bgp_attr.c +++ b/bgpd/bgp_attr.c @@ -797,8 +797,8 @@ attr_show_all_iterator (struct hash_backet *backet, struct vty *vty) { struct attr *attr = backet->data; - vty_out (vty, "attr[%ld] nexthop %s%s", attr->refcnt, - inet_ntoa (attr->nexthop), VTY_NEWLINE); + vty_outln (vty, "attr[%ld] nexthop %s", attr->refcnt, + inet_ntoa(attr->nexthop)); } void |