]> git.proxmox.com Git - mirror_frr.git/commit
projects / mirror_frr.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 6a534dc 700e9fa)
Merge remote-tracking branch 'frr/master' into rip-vrf
authorRenato Westphal <renato@opensourcerouting.org>
Sat, 2 Mar 2019 18:00:46 +0000 (15:00 -0300)
committerRenato Westphal <renatowestphal@gmail.com>
Fri, 29 Mar 2019 14:32:21 +0000 (11:32 -0300)
commit8f88441d717c0ded412543cceabf0ddd93ee9f09
tree0a460d2da46a5b910535529c92e8db2fa5ff2a74tree
parent6a534dcafcb623f1b85b5ee2a13c74faab227cedcommit | diff
parent700e9faa28bbdc3460e1d7aa109b6e4acaf347b3commit | diff
Merge remote-tracking branch 'frr/master' into rip-vrf

Merge commit to solve a bunch of conflicts with other PRs that were
merged in the previous weeks.

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
16 files changed:
lib/vrf.c diff1 | diff2 | blob | history
lib/vrf.h diff1 | diff2 | blob | history
lib/yang.c diff1 | diff2 | blob | history
lib/yang.h diff1 | diff2 | blob | history
ripd/rip_cli.c diff1 | diff2 | blob | history
ripd/rip_main.c diff1 | diff2 | blob | history
ripd/rip_northbound.c diff1 | diff2 | blob | history
ripd/ripd.c diff1 | diff2 | blob | history
ripd/ripd.h diff1 | diff2 | blob | history
ripngd/ripng_cli.c diff1 | diff2 | blob | history
ripngd/ripng_interface.c diff1 | diff2 | blob | history
ripngd/ripng_main.c diff1 | diff2 | blob | history
ripngd/ripng_northbound.c diff1 | diff2 | blob | history
ripngd/ripngd.c diff1 | diff2 | blob | history
ripngd/ripngd.h diff1 | diff2 | blob | history
vtysh/vtysh.c diff1 | diff2 | blob | history
FRRouting mirror