]> git.puffer.fish Git - mirror/frr.git/commit
doc: manually merge isis.rst
authorQuentin Young <qlyoung@cumulusnetworks.com>
Tue, 30 Jan 2018 21:12:26 +0000 (16:12 -0500)
committerQuentin Young <qlyoung@cumulusnetworks.com>
Tue, 30 Jan 2018 21:12:26 +0000 (16:12 -0500)
commitcb39e63e59ab338eb1edb40df4af6e55a5ecd9a9
treebd0dbeff9c17d723b8bb92617c972fae952a8871
parente3c1296cb4c6f5161d2447b194c853ae423c7467
doc: manually merge isis.rst

Manually merged:

ee65c55e2a923dd9499baa3207d629a09600ba64

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
doc/user/isisd.rst