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 /bgpd/rfapi/vnc_debug.c | |
| parent | 625e016d14073dfefb69c0fa36cddb81fbe034ed (diff) | |
| parent | 905c15079393987f8cfdd55c30e7e1a3248c8c48 (diff) | |
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 'bgpd/rfapi/vnc_debug.c')
| -rw-r--r-- | bgpd/rfapi/vnc_debug.c | 4 | 
1 files changed, 2 insertions, 2 deletions
diff --git a/bgpd/rfapi/vnc_debug.c b/bgpd/rfapi/vnc_debug.c index 21627a20a5..1f9e1b10fe 100644 --- a/bgpd/rfapi/vnc_debug.c +++ b/bgpd/rfapi/vnc_debug.c @@ -86,7 +86,7 @@ DEFUN (debug_bgp_vnc,  	}      }    vty_out (vty, "Unknown debug flag: %s\n", argv[3]->arg); -  return CMD_WARNING; +  return CMD_WARNING_CONFIG_FAILED;  }  DEFUN (no_debug_bgp_vnc, @@ -125,7 +125,7 @@ DEFUN (no_debug_bgp_vnc,  	}      }    vty_out (vty, "Unknown debug flag: %s\n", argv[3]->arg); -  return CMD_WARNING; +  return CMD_WARNING_CONFIG_FAILED;  }  | 
