]> git.proxmox.com Git - mirror_frr.git/commit
Merge branch 'master' into docuser
authorQuentin Young <qlyoung@cumulusnetworks.com>
Thu, 1 Mar 2018 16:10:01 +0000 (11:10 -0500)
committerQuentin Young <qlyoung@cumulusnetworks.com>
Thu, 1 Mar 2018 16:10:01 +0000 (11:10 -0500)
commita975744835bb87e3cf62701e13248d66f1dac1df
treebca5ab1f29594688c43e0c36c9eb2f0c5c8e66c6
parent351c56649bfd8487676704a10995d736d1d893cc
parentc98f4d81aa5d4113ceea58ce6db4bebab5c99735
Merge branch 'master' into docuser

* New manpage: mtracebis.rst
* Makefile.am includes mtracebis.rst
* configure.ac lines removed
* Debian packaging files updated
* Fixed up manpage |seealso-programs| in the process
* Centos7 build package list updated to include systemd-devel
* New paragraph on netns vrf support in zebra manpage

Conflicts:
configure.ac
debianpkg/backports/ubuntu14.04/debian/frr.install
debianpkg/frr.install
doc/Makefile.am
doc/developer/Building_FRR_on_CentOS7.rst
doc/zebra.8.in

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
12 files changed:
debianpkg/backports/ubuntu14.04/debian/frr.install
debianpkg/frr.install
doc/Makefile.am
doc/developer/Building_FRR_on_CentOS7.rst
doc/manpages/conf.py
doc/manpages/defines.rst
doc/manpages/epilogue.rst
doc/manpages/frr.rst
doc/manpages/index.rst
doc/manpages/mtracebis.rst
doc/manpages/ospfclient.rst
doc/manpages/zebra.rst