Merge pull request #1665 from donaldsharp/nexthop_labels

author Russ White <russ@riw.us>

Wed, 24 Jan 2018 00:09:08 +0000 (19:09 -0500)

committer GitHub <noreply@github.com>

Wed, 24 Jan 2018 00:09:08 +0000 (19:09 -0500)
author Russ White <russ@riw.us>
Wed, 24 Jan 2018 00:09:08 +0000 (19:09 -0500)
committer GitHub <noreply@github.com>
Wed, 24 Jan 2018 00:09:08 +0000 (19:09 -0500)
diff --cc lib/zclient.c
Simple merge
diff --cc lib/zclient.h
Simple merge
author	Russ White <russ@riw.us>
	Wed, 24 Jan 2018 00:09:08 +0000 (19:09 -0500)
committer	GitHub <noreply@github.com>
	Wed, 24 Jan 2018 00:09:08 +0000 (19:09 -0500)
		1	2
lib/zclient.c	patch \|	diff1 \|	diff2 \|	blob \| history
lib/zclient.h	patch \|	diff1 \|	diff2 \|	blob \| history