]> git.proxmox.com Git - mirror_frr.git/commit - lib/vrf.c
Merge branch 'queue/osr/vtysh-generic'
authorDavid Lamparter <equinox@opensourcerouting.org>
Mon, 5 Dec 2016 19:04:08 +0000 (20:04 +0100)
committerDavid Lamparter <equinox@opensourcerouting.org>
Mon, 5 Dec 2016 19:04:08 +0000 (20:04 +0100)
commit7ddcfca4fb5246c5e211f7e37d98a8c9a51b4e70
treeea8dead406e7963c4b8283477daea4d5224845ac
parent53dc2b05c76f4f5cd6a72373fb241afdcedb2ee1
parent54c5dce6a5e46717ad52c80f2dc99fc36a372e28
Merge branch 'queue/osr/vtysh-generic'

WARNING: Merge contains nontrivial fixups in vrf_cmd handling.

Conflicts:
lib/if.c
zebra/interface.c
lib/command.c
lib/if.c
lib/if.h
lib/vrf.c
lib/vrf.h
ospfd/ospf_vty.c
ripd/rip_interface.c
ripngd/ripng_interface.c
zebra/interface.c
zebra/zebra_vrf.c