diff options
| author | Daniel Walton <dwalton@cumulusnetworks.com> | 2017-07-10 13:06:19 +0000 |
|---|---|---|
| committer | Daniel Walton <dwalton@cumulusnetworks.com> | 2017-07-10 13:06:19 +0000 |
| commit | dfd8121281fbefa0b43e6aa960837dc0cca543a8 (patch) | |
| tree | d5cf5869cf836759c68f53635109223e2724b0e6 /lib/command.c | |
| parent | dd6bd0f16d64458cfb4956bef1695d68d32c7676 (diff) | |
| parent | 1e5e04888f54b85350117ef52776761506e1f983 (diff) | |
Merge branch 'master' of https://github.com/dwalton76/frr into bgpd-ipv4-plus-label-misc3
Conflicts:
bgpd/bgp_route.c
bgpd/bgp_zebra.c
Diffstat (limited to 'lib/command.c')
| -rw-r--r-- | lib/command.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/lib/command.c b/lib/command.c index de8899687c..5ca4a0fda9 100644 --- a/lib/command.c +++ b/lib/command.c @@ -2200,7 +2200,6 @@ DEFUN (no_config_log_file, "Logging control\n" "Cancel logging to file\n" "Logging file name\n" - "Logging file name\n" "Logging level\n") { zlog_reset_file (); |