Merge pull request #3007 from pacovn/static_analysis__shadow_variables2

author Donald Sharp <sharpd@cumulusnetworks.com>

Thu, 13 Sep 2018 12:38:32 +0000 (08:38 -0400)

committer GitHub <noreply@github.com>

Thu, 13 Sep 2018 12:38:32 +0000 (08:38 -0400)
author Donald Sharp <sharpd@cumulusnetworks.com>
Thu, 13 Sep 2018 12:38:32 +0000 (08:38 -0400)
committer GitHub <noreply@github.com>
Thu, 13 Sep 2018 12:38:32 +0000 (08:38 -0400)
diff --cc lib/buffer.c
Simple merge
diff --cc zebra/rt_netlink.c
Simple merge
author	Donald Sharp <sharpd@cumulusnetworks.com>
	Thu, 13 Sep 2018 12:38:32 +0000 (08:38 -0400)
committer	GitHub <noreply@github.com>
	Thu, 13 Sep 2018 12:38:32 +0000 (08:38 -0400)
		1	2
lib/buffer.c	patch \|	diff1 \|	diff2 \|	blob \| history
zebra/rt_netlink.c	patch \|	diff1 \|	diff2 \|	blob \| history