Merge pull request #5851 from volta-networks/feat_ldp_oc_review

author Renato Westphal <renato@opensourcerouting.org>

Mon, 23 Mar 2020 13:55:20 +0000 (10:55 -0300)

committer GitHub <noreply@github.com>

Mon, 23 Mar 2020 13:55:20 +0000 (10:55 -0300)
author Renato Westphal <renato@opensourcerouting.org>
Mon, 23 Mar 2020 13:55:20 +0000 (10:55 -0300)
committer GitHub <noreply@github.com>
Mon, 23 Mar 2020 13:55:20 +0000 (10:55 -0300)
diff --cc ldpd/lde.c
Simple merge
diff --cc ldpd/ldpd.c
Simple merge
diff --cc ldpd/ldpd.h
Simple merge
author	Renato Westphal <renato@opensourcerouting.org>
	Mon, 23 Mar 2020 13:55:20 +0000 (10:55 -0300)
committer	GitHub <noreply@github.com>
	Mon, 23 Mar 2020 13:55:20 +0000 (10:55 -0300)
		1	2
ldpd/lde.c	patch \|	diff1 \|	diff2 \|	blob \| history
ldpd/ldpd.c	patch \|	diff1 \|	diff2 \|	blob \| history
ldpd/ldpd.h	patch \|	diff1 \|	diff2 \|	blob \| history