]> git.puffer.fish Git - mirror/frr.git/commitdiff
Merge pull request #1160 from opensourcerouting/admin_distance
authorDonald Sharp <sharpd@cumulusnetworks.com>
Thu, 21 Sep 2017 11:55:08 +0000 (07:55 -0400)
committerGitHub <noreply@github.com>
Thu, 21 Sep 2017 11:55:08 +0000 (07:55 -0400)
Admin distance

1  2 
zebra/zebra_rib.c

Simple merge