diff options
author | David Lamparter <equinox@opensourcerouting.org> | 2017-07-14 13:07:30 +0200 |
---|---|---|
committer | David Lamparter <equinox@opensourcerouting.org> | 2017-07-14 13:07:30 +0200 |
commit | 2d8270596a085e7a815cebaea21e17cba9e26111 (patch) | |
tree | f9a559f654e7d704ecacc9dadedbe01868615610 /ripd/rip_debug.c | |
parent | *: remove VTYNL, part 6 of 6 (diff) | |
parent | Merge pull request #815 from dwalton76/CMD_WARNING_take2 (diff) | |
download | frr-2d8270596a085e7a815cebaea21e17cba9e26111.tar.xz frr-2d8270596a085e7a815cebaea21e17cba9e26111.zip |
Merge remote-tracking branch 'frr/master' into newline-redux
Lots of conflicts from CMD_WARNING_CONFIG_FAILED...
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
Diffstat (limited to 'ripd/rip_debug.c')
-rw-r--r-- | ripd/rip_debug.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ripd/rip_debug.c b/ripd/rip_debug.c index a88837d90..04252a85f 100644 --- a/ripd/rip_debug.c +++ b/ripd/rip_debug.c @@ -68,7 +68,7 @@ DEFUN (debug_rip_events, "RIP events\n") { rip_debug_event = RIP_DEBUG_EVENT; - return CMD_WARNING; + return CMD_WARNING_CONFIG_FAILED; } DEFUN (debug_rip_packet, @@ -110,7 +110,7 @@ DEFUN (debug_rip_zebra, "RIP and ZEBRA communication\n") { rip_debug_zebra = RIP_DEBUG_ZEBRA; - return CMD_WARNING; + return CMD_WARNING_CONFIG_FAILED; } DEFUN (no_debug_rip_events, @@ -174,7 +174,7 @@ DEFUN (no_debug_rip_zebra, "RIP and ZEBRA communication\n") { rip_debug_zebra = 0; - return CMD_WARNING; + return CMD_WARNING_CONFIG_FAILED; } /* Debug node. */ |