Merge pull request #4082 from opensourcerouting/grpc-nb-plugin

author Quentin Young <qlyoung@users.noreply.github.com>

Tue, 7 May 2019 20:53:17 +0000 (16:53 -0400)

committer GitHub <noreply@github.com>

Tue, 7 May 2019 20:53:17 +0000 (16:53 -0400)
author Quentin Young <qlyoung@users.noreply.github.com>
Tue, 7 May 2019 20:53:17 +0000 (16:53 -0400)
committer GitHub <noreply@github.com>
Tue, 7 May 2019 20:53:17 +0000 (16:53 -0400)
diff --cc Makefile.am
Simple merge
diff --cc configure.ac
Simple merge
diff --cc lib/subdir.am
Simple merge
author	Quentin Young <qlyoung@users.noreply.github.com>
	Tue, 7 May 2019 20:53:17 +0000 (16:53 -0400)
committer	GitHub <noreply@github.com>
	Tue, 7 May 2019 20:53:17 +0000 (16:53 -0400)
		1	2
Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history
lib/subdir.am	patch \|	diff1 \|	diff2 \|	blob \| history