diff options
| author | David Lamparter <equinox@opensourcerouting.org> | 2017-05-18 12:15:04 +0200 |
|---|---|---|
| committer | David Lamparter <equinox@opensourcerouting.org> | 2017-05-18 12:23:13 +0200 |
| commit | 92eedda1fb1b9c9fb2c31153677a033bee4573d3 (patch) | |
| tree | d99e2aa0ac3346dc20c766026e717cf69b0abbbb /vtysh | |
| parent | Merge branch 'frr/pull/548' ("Pim dev 3.0 defect fixes") (diff) | |
| parent | Pre-revert nonmergeable changes (diff) | |
| download | frr-92eedda1fb1b9c9fb2c31153677a033bee4573d3.tar.xz frr-92eedda1fb1b9c9fb2c31153677a033bee4573d3.zip | |
Merge branch stable/2.0 into stable/3.0
Conflicts:
bgpd/bgp_fsm.c
ospf6d/ospf6_lsa.c
ospfd/ospf_vty.c
zebra/redistribute.c
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
Diffstat (limited to 'vtysh')
| -rw-r--r-- | vtysh/vtysh.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vtysh/vtysh.c b/vtysh/vtysh.c index 5c39e1ee9..337925c6e 100644 --- a/vtysh/vtysh.c +++ b/vtysh/vtysh.c @@ -646,7 +646,7 @@ vtysh_mark_file (const char *filename) } } /* This is the end */ - fprintf(stdout, "end\n"); + fprintf(stdout, "\nend\n"); vty_close(vty); XFREE(MTYPE_VTYSH_CMD, vty_buf_copy); |