diff options
| author | Quentin Young <qlyoung@cumulusnetworks.com> | 2018-03-01 17:10:01 +0100 |
|---|---|---|
| committer | Quentin Young <qlyoung@cumulusnetworks.com> | 2018-03-01 17:10:01 +0100 |
| commit | a975744835bb87e3cf62701e13248d66f1dac1df (patch) | |
| tree | bca5ab1f29594688c43e0c36c9eb2f0c5c8e66c6 /debianpkg | |
| parent | debianpkg: disable pdf build by default (diff) | |
| parent | Merge pull request #1784 from donaldsharp/documentation (diff) | |
| download | frr-a975744835bb87e3cf62701e13248d66f1dac1df.tar.xz frr-a975744835bb87e3cf62701e13248d66f1dac1df.zip | |
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>
Diffstat (limited to 'debianpkg')
| -rw-r--r-- | debianpkg/backports/ubuntu14.04/debian/frr.install | 1 | ||||
| -rw-r--r-- | debianpkg/frr.install | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/debianpkg/backports/ubuntu14.04/debian/frr.install b/debianpkg/backports/ubuntu14.04/debian/frr.install index 170932084..0b0d953ac 100644 --- a/debianpkg/backports/ubuntu14.04/debian/frr.install +++ b/debianpkg/backports/ubuntu14.04/debian/frr.install @@ -1,5 +1,6 @@ etc/frr/ usr/bin/vtysh +usr/bin/mtracebis usr/include/frr/ usr/lib/ tools/frr etc/init.d/ diff --git a/debianpkg/frr.install b/debianpkg/frr.install index 35dfe4377..8d1266270 100644 --- a/debianpkg/frr.install +++ b/debianpkg/frr.install @@ -1,5 +1,6 @@ etc/frr/ usr/bin/vtysh +usr/bin/mtracebis usr/include/frr/ usr/lib/ tools/frr usr/lib/frr |