Merge pull request #3031 from pacovn/static_analysis__Wcomma

author Lou Berger <lberger@labn.net>

Mon, 17 Sep 2018 10:03:49 +0000 (06:03 -0400)

committer GitHub <noreply@github.com>

Mon, 17 Sep 2018 10:03:49 +0000 (06:03 -0400)
author Lou Berger <lberger@labn.net>
Mon, 17 Sep 2018 10:03:49 +0000 (06:03 -0400)
committer GitHub <noreply@github.com>
Mon, 17 Sep 2018 10:03:49 +0000 (06:03 -0400)
diff --cc isisd/isis_circuit.c
Simple merge
diff --cc zebra/zebra_vxlan.c
Simple merge
author	Lou Berger <lberger@labn.net>
	Mon, 17 Sep 2018 10:03:49 +0000 (06:03 -0400)
committer	GitHub <noreply@github.com>
	Mon, 17 Sep 2018 10:03:49 +0000 (06:03 -0400)
		1	2
isisd/isis_circuit.c	patch \|	diff1 \|	diff2 \|	blob \| history
zebra/zebra_vxlan.c	patch \|	diff1 \|	diff2 \|	blob \| history