Merge branch 'master' of https://github.com/dwalton76/frr into bgpd-ipv4-plus-label-misc3

Conflicts:
	bgpd/bgp_route.c

1 files changed, 4 insertions, 4 deletions

diff --git a/pimd/pim_msdp.c b/pimd/pim_msdp.c
index ed1284a95d..18e24dae32 100644
--- a/pimd/pim_msdp.c
+++ b/pimd/pim_msdp.c
@@ -1533,15 +1533,15 @@ pim_msdp_config_write(struct vty *vty)
 
   if (mg->src_ip.s_addr != INADDR_ANY) {
     pim_inet4_dump("<src?>", mg->src_ip, src_str, sizeof(src_str));
-    vty_out(vty, "ip msdp mesh-group %s source %s%s",
-        mg->mesh_group_name, src_str, VTY_NEWLINE);
+    vty_outln (vty, "ip msdp mesh-group %s source %s",
+        mg->mesh_group_name, src_str);
     ++count;
   }
 
   for (ALL_LIST_ELEMENTS_RO(mg->mbr_list, mbrnode, mbr)) {
     pim_inet4_dump("<mbr?>", mbr->mbr_ip, mbr_str, sizeof(mbr_str));
-    vty_out(vty, "ip msdp mesh-group %s member %s%s",
-        mg->mesh_group_name, mbr_str, VTY_NEWLINE);
+    vty_outln (vty, "ip msdp mesh-group %s member %s",
+        mg->mesh_group_name, mbr_str);
     ++count;
   }
   return count;