Merge pull request #233 from donaldsharp/ecmp1

author Renato Westphal <renato@openbsd.org>

Fri, 3 Mar 2017 15:42:52 +0000 (12:42 -0300)

committer GitHub <noreply@github.com>

Fri, 3 Mar 2017 15:42:52 +0000 (12:42 -0300)
author Renato Westphal <renato@openbsd.org>
Fri, 3 Mar 2017 15:42:52 +0000 (12:42 -0300)
committer GitHub <noreply@github.com>
Fri, 3 Mar 2017 15:42:52 +0000 (12:42 -0300)
diff --cc bgpd/bgp_vty.c
Simple merge
diff --cc bgpd/bgpd.c
Simple merge
diff --cc zebra/rt_netlink.c
Simple merge
author	Renato Westphal <renato@openbsd.org>
	Fri, 3 Mar 2017 15:42:52 +0000 (12:42 -0300)
committer	GitHub <noreply@github.com>
	Fri, 3 Mar 2017 15:42:52 +0000 (12:42 -0300)
		1	2
bgpd/bgp_vty.c	patch \|	diff1 \|	diff2 \|	blob \| history
bgpd/bgpd.c	patch \|	diff1 \|	diff2 \|	blob \| history
zebra/rt_netlink.c	patch \|	diff1 \|	diff2 \|	blob \| history