]> git.proxmox.com Git - mirror_frr.git/commitdiff
Merge pull request #10124 from ton31337/feature/vty_json
authorIgor Ryzhov <idryzhov@gmail.com>
Sun, 28 Nov 2021 23:11:29 +0000 (02:11 +0300)
committerGitHub <noreply@github.com>
Sun, 28 Nov 2021 23:11:29 +0000 (02:11 +0300)
1  2 
bgpd/bgp_evpn_vty.c
bgpd/bgp_route.c
bgpd/bgp_vty.c
lib/plist.c
ospfd/ospf_vty.c
pbrd/pbr_vty.c
pimd/pim_rp.c
zebra/interface.c

Simple merge
Simple merge
diff --cc bgpd/bgp_vty.c
Simple merge
diff --cc lib/plist.c
Simple merge
Simple merge
diff --cc pbrd/pbr_vty.c
Simple merge
diff --cc pimd/pim_rp.c
Simple merge
Simple merge