Merge pull request #285 from bingen/label_manager_3

author Donald Sharp <sharpd@cumulusnetworks.com>

Tue, 21 Mar 2017 15:40:20 +0000 (11:40 -0400)

committer GitHub <noreply@github.com>

Tue, 21 Mar 2017 15:40:20 +0000 (11:40 -0400)
author Donald Sharp <sharpd@cumulusnetworks.com>
Tue, 21 Mar 2017 15:40:20 +0000 (11:40 -0400)
committer GitHub <noreply@github.com>
Tue, 21 Mar 2017 15:40:20 +0000 (11:40 -0400)
diff --cc ldpd/ldpd.c
Simple merge
diff --cc lib/zclient.c
Simple merge
author	Donald Sharp <sharpd@cumulusnetworks.com>
	Tue, 21 Mar 2017 15:40:20 +0000 (11:40 -0400)
committer	GitHub <noreply@github.com>
	Tue, 21 Mar 2017 15:40:20 +0000 (11:40 -0400)
		1	2
ldpd/ldpd.c	patch \|	diff1 \|	diff2 \|	blob \| history
lib/zclient.c	patch \|	diff1 \|	diff2 \|	blob \| history