]> git.proxmox.com Git - mirror_frr.git/commit
Merge branch 'master' into docs-user
authorQuentin Young <qlyoung@cumulusnetworks.com>
Tue, 30 Jan 2018 20:05:15 +0000 (15:05 -0500)
committerQuentin Young <qlyoung@cumulusnetworks.com>
Tue, 30 Jan 2018 20:05:15 +0000 (15:05 -0500)
commitd38549c99dd39a6f5df0acd3efa48284d077ea66
treedbda4b5f85ad834790fd330386fa567efe29d9f0
parentc1a54c054d434b9e50467db30665cfb688e16a2e
parent08951735bd9cf05a0abdd1a1c2eb17fca2043618
Merge branch 'master' into docs-user

Manually merged these doc commits:

3bb7cd7f56649ef17eeada95c132de1146c5fc92
ff21655441a64c427b3e373272e7b4564a8a1bb1
doc/user/bgp.rst
doc/user/vnc.rst