Merge pull request #1240 from donaldsharp/allow_self_delete

author Renato Westphal <renato@openbsd.org>

Wed, 27 Sep 2017 12:11:11 +0000 (09:11 -0300)

committer GitHub <noreply@github.com>

Wed, 27 Sep 2017 12:11:11 +0000 (09:11 -0300)
author Renato Westphal <renato@openbsd.org>
Wed, 27 Sep 2017 12:11:11 +0000 (09:11 -0300)
committer GitHub <noreply@github.com>
Wed, 27 Sep 2017 12:11:11 +0000 (09:11 -0300)
diff --cc zebra/rt_netlink.c
Simple merge
diff --cc zebra/zebra_rib.c
Simple merge
author	Renato Westphal <renato@openbsd.org>
	Wed, 27 Sep 2017 12:11:11 +0000 (09:11 -0300)
committer	GitHub <noreply@github.com>
	Wed, 27 Sep 2017 12:11:11 +0000 (09:11 -0300)
		1	2
zebra/rt_netlink.c	patch \|	diff1 \|	diff2 \|	blob \| history
zebra/zebra_rib.c	patch \|	diff1 \|	diff2 \|	blob \| history