git.puffer.fish Git - mirror/frr.git/commit

]> git.puffer.fish Git - mirror/frr.git/commit

author	David Lamparter <equinox@opensourcerouting.org>
	Tue, 4 Apr 2017 16:34:08 +0000 (18:34 +0200)
committer	David Lamparter <equinox@opensourcerouting.org>
	Tue, 4 Apr 2017 17:01:47 +0000 (19:01 +0200)
commit	3e7c8d040ce092d42b485cb45461af575a99e39e
tree	20ddb4bf5d39b348041af75b7102623e4f0d29c2	tree \| snapshot
parent	e5fd248c254463830f96eb35d8ea60385ab226c0	commit \| diff
parent	3e71b5d907e9a58049e188cd88ad86614c5ad4f6	commit \| diff

Merge branch 'stable/2.0'

Fixed minor conflicts from "defaults" change on stable.

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>

26 files changed:

Makefile.am	diff1 \|	diff2 \|	blob \| history
bgpd/bgpd.c	diff1 \|	diff2 \|	blob \| history
bgpd/bgpd.h	diff1 \|	diff2 \|	blob \| history
configure.ac	diff1 \|	diff2 \|	blob \| history
doc/Building_FRR_on_CentOS6.md	diff1 \|	diff2 \|	blob \| history
doc/Building_FRR_on_CentOS7.md	diff1 \|	diff2 \|	blob \| history
doc/Building_FRR_on_Debian8.md	diff1 \|	diff2 \|	blob \| history
doc/Building_FRR_on_Fedora24.md	diff1 \|	diff2 \|	blob \| history
doc/Building_FRR_on_FreeBSD10.md	diff1 \|	diff2 \|	blob \| history
doc/Building_FRR_on_FreeBSD11.md	diff1 \|	diff2 \|	blob \| history
doc/Building_FRR_on_FreeBSD9.md	diff1 \|	diff2 \|	blob \| history
doc/Building_FRR_on_NetBSD6.md	diff1 \|	diff2 \|	blob \| history
doc/Building_FRR_on_NetBSD7.md	diff1 \|	diff2 \|	blob \| history
doc/Building_FRR_on_OmniOS.md	diff1 \|	diff2 \|	blob \| history
doc/Building_FRR_on_OpenBSD6.md	diff1 \|	diff2 \|	blob \| history
doc/Building_FRR_on_Ubuntu1204.md	diff1 \|	diff2 \|	blob \| history
doc/Building_FRR_on_Ubuntu1404.md	diff1 \|	diff2 \|	blob \| history
doc/Building_FRR_on_Ubuntu1604.md	diff1 \|	diff2 \|	blob \| history
doc/frr.texi	diff1 \|	diff2 \|	blob \| history
lib/command.c	diff1 \|	diff2 \|	blob \| history
ospf6d/ospf6_top.c	diff1 \|	diff2 \|	blob \| history
ospfd/ospf_vty.c	diff1 \|	diff2 \|	blob \| history
ospfd/ospfd.c	diff1 \|	diff2 \|	blob \| history
redhat/frr.spec.in	diff1 \|	diff2 \|	blob \| history
tests/lib/cli/test_cli.refout.in	\|	diff2 \|	blob \| history
zebra/zebra_fpm_protobuf.c	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.

Makefile.am	diff1 \|	diff2 \|	blob \| history
bgpd/bgpd.c	diff1 \|	diff2 \|	blob \| history
bgpd/bgpd.h	diff1 \|	diff2 \|	blob \| history
configure.ac	diff1 \|	diff2 \|	blob \| history
doc/Building_FRR_on_CentOS6.md	diff1 \|	diff2 \|	blob \| history
doc/Building_FRR_on_CentOS7.md	diff1 \|	diff2 \|	blob \| history
doc/Building_FRR_on_Debian8.md	diff1 \|	diff2 \|	blob \| history
doc/Building_FRR_on_Fedora24.md	diff1 \|	diff2 \|	blob \| history
doc/Building_FRR_on_FreeBSD10.md	diff1 \|	diff2 \|	blob \| history
doc/Building_FRR_on_FreeBSD11.md	diff1 \|	diff2 \|	blob \| history
doc/Building_FRR_on_FreeBSD9.md	diff1 \|	diff2 \|	blob \| history
doc/Building_FRR_on_NetBSD6.md	diff1 \|	diff2 \|	blob \| history
doc/Building_FRR_on_NetBSD7.md	diff1 \|	diff2 \|	blob \| history
doc/Building_FRR_on_OmniOS.md	diff1 \|	diff2 \|	blob \| history
doc/Building_FRR_on_OpenBSD6.md	diff1 \|	diff2 \|	blob \| history
doc/Building_FRR_on_Ubuntu1204.md	diff1 \|	diff2 \|	blob \| history
doc/Building_FRR_on_Ubuntu1404.md	diff1 \|	diff2 \|	blob \| history
doc/Building_FRR_on_Ubuntu1604.md	diff1 \|	diff2 \|	blob \| history
doc/frr.texi	diff1 \|	diff2 \|	blob \| history
lib/command.c	diff1 \|	diff2 \|	blob \| history
ospf6d/ospf6_top.c	diff1 \|	diff2 \|	blob \| history
ospfd/ospf_vty.c	diff1 \|	diff2 \|	blob \| history
ospfd/ospfd.c	diff1 \|	diff2 \|	blob \| history
redhat/frr.spec.in	diff1 \|	diff2 \|	blob \| history
tests/lib/cli/test_cli.refout.in	\|	diff2 \|	blob \| history
zebra/zebra_fpm_protobuf.c	diff1 \|	diff2 \|	blob \| history