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/lib/vrf.c b/lib/vrf.c
index d5cff4e2e5..6ad8cd91b6 100644
--- a/lib/vrf.c
+++ b/lib/vrf.c
@@ -475,7 +475,7 @@ DEFUN_NOSH (vrf,
     {
       vty_out (vty, "%% VRF name %s is invalid: length exceeds "
                     "%d characters%s",
-               vrfname, VRF_NAMSIZ, VTY_NEWLINE);
+               vrfname, VRF_NAMSIZ, VTYNL);
       return CMD_WARNING;
     }
 
@@ -501,14 +501,14 @@ DEFUN_NOSH (no_vrf,
 
   if (vrfp == NULL)
     {
-      vty_out (vty, "%% VRF %s does not exist%s", vrfname, VTY_NEWLINE);
+      vty_out (vty, "%% VRF %s does not exist%s", vrfname, VTYNL);
       return CMD_WARNING;
     }
 
   if (CHECK_FLAG (vrfp->status, VRF_ACTIVE))
     {
       vty_out (vty, "%% Only inactive VRFs can be deleted%s",
-              VTY_NEWLINE);
+              VTYNL);
       return CMD_WARNING;
     }
 
@@ -555,7 +555,7 @@ static int
 vrf_write_host (struct vty *vty)
 {
   if (debug_vrf)
-    vty_out (vty, "debug vrf%s", VTY_NEWLINE);
+    vty_outln (vty, "debug vrf");
 
   return 1;
 }