]> git.puffer.fish Git - matthieu/frr.git/commit
projects / matthieu / frr.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: e2675fb) | patch
merge: pre-revert inapplicable changes
authorDavid Lamparter <equinox@opensourcerouting.org>
Fri, 10 Mar 2017 13:16:37 +0000 (14:16 +0100)
committerDavid Lamparter <equinox@opensourcerouting.org>
Fri, 10 Mar 2017 13:18:20 +0000 (14:18 +0100)
commitb32cba291bcf4661b5c4853ed76087580ba763eb
tree5516aaa1af2518fb4952c7d05d1babc1dfa8ec44tree | snapshot
parente2675fbd5689f2290f5d7b0fb1cd09f58828a3e3commit | diff
merge: pre-revert inapplicable changes

The following changes do not apply on master because the code has
changed:

- "vtysh: fix completion"
  reverts commit 09e61a383facd3c9e3e52162e98302c7cba15ecc.
- "Revert "lib: Fix tab completions memleak, memory stats corruption""
  reverts commit 4dcee34bd603645e53f8a8265dd263a85422b63d.

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
lib/command.c diff | blob | history
vtysh/vtysh.c diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.