]> git.puffer.fish Git - matthieu/frr.git/commit
zebra-mpls: fix regression caused by wrong conflict resolution
authorRenato Westphal <renato@opensourcerouting.org>
Fri, 9 Dec 2016 00:04:52 +0000 (22:04 -0200)
committerDonald Sharp <sharpd@cumulusnetworks.com>
Wed, 14 Dec 2016 18:21:08 +0000 (13:21 -0500)
commite5dd4bef5eeeac880ba97480b76d46f32726985a
treecac5b5217833efeb86c81c8b98478f244ee27931
parent0f12455901fa5d424c28b4af854f6b78e54bafd3
zebra-mpls: fix regression caused by wrong conflict resolution

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
zebra/zebra_vty.c