]> git.puffer.fish Git - mirror/frr.git/commitdiff
Merge pull request #6342 from Orange-OpenSource/dev_isis_sr dev_isis_sr 6404/head 6413/head
authorRenato Westphal <renato@opensourcerouting.org>
Thu, 14 May 2020 17:23:03 +0000 (14:23 -0300)
committerGitHub <noreply@github.com>
Thu, 14 May 2020 17:23:03 +0000 (14:23 -0300)
isisd: Preparation to merge Segment-Routing into master


Trivial merge