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

Conflicts:
	bgpd/bgp_route.c

1 files changed, 3 insertions, 3 deletions

diff --git a/lib/agentx.c b/lib/agentx.c
index fda634bb86..08cd650153 100644
--- a/lib/agentx.c
+++ b/lib/agentx.c
@@ -168,7 +168,7 @@ static int
 config_write_agentx (struct vty *vty)
 {
   if (agentx_enabled)
-      vty_out (vty, "agentx%s", VTY_NEWLINE);
+      vty_outln (vty, "agentx");
   return 1;
 }
 
@@ -186,7 +186,7 @@ DEFUN (agentx_enable,
       agentx_enabled = 1;
       return CMD_SUCCESS;
     }
-  vty_out (vty, "SNMP AgentX already enabled%s", VTY_NEWLINE);
+  vty_outln (vty, "SNMP AgentX already enabled");
   return CMD_SUCCESS;
 }
 
@@ -198,7 +198,7 @@ DEFUN (no_agentx,
        "SNMP AgentX settings\n")
 {
   if (!agentx_enabled) return CMD_SUCCESS;
-  vty_out (vty, "SNMP AgentX support cannot be disabled once enabled%s", VTY_NEWLINE);
+  vty_outln (vty, "SNMP AgentX support cannot be disabled once enabled");
   return CMD_WARNING;
 }