summaryrefslogtreecommitdiffstats
path: root/vtysh
diff options
context:
space:
mode:
authorDonald Sharp <sharpd@cumulusnetworks.com>2017-04-26 14:03:54 +0200
committerDonald Sharp <sharpd@cumulusnetworks.com>2017-04-26 14:03:54 +0200
commit6aa210418ec5f573bc393a170b283e899a27b8e8 (patch)
tree3bb782683a5094efc37fa24b846f9e7f097624b2 /vtysh
parentcumulus: Add EIGRP to default file (diff)
parentMerge remote-tracking branch 'origin/stable/3.0' (diff)
downloadfrr-6aa210418ec5f573bc393a170b283e899a27b8e8.tar.xz
frr-6aa210418ec5f573bc393a170b283e899a27b8e8.zip
Merge remote-tracking branch 'origin/master' into EIGRP
Diffstat (limited to 'vtysh')
-rw-r--r--vtysh/vtysh.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/vtysh/vtysh.c b/vtysh/vtysh.c
index 0473b244a..0af17abea 100644
--- a/vtysh/vtysh.c
+++ b/vtysh/vtysh.c
@@ -1228,9 +1228,7 @@ DEFUNSH (VTYSH_BGPD,
"Layer2 VPN Address family\n"
"Ethernet Virtual Private Network Subsequent Address Family\n")
{
-#if defined(HAVE_EVPN)
vty->node = BGP_EVPN_NODE;
-#endif /* HAVE_EVPN */
return CMD_SUCCESS;
}
@@ -2203,7 +2201,7 @@ DEFUNSH (VTYSH_ALL,
DEFUNSH (VTYSH_ALL,
vtysh_log_syslog,
vtysh_log_syslog_cmd,
- "log syslog <emergencies|alerts|critical|errors|warnings|notifications|informational|debugging>",
+ "log syslog [<emergencies|alerts|critical|errors|warnings|notifications|informational|debugging>]",
"Logging control\n"
"Set syslog logging level\n"
LOG_LEVEL_DESC)