Merge pull request #3051 from mitch-skiba/addpath_change_V1

author Donald Sharp <sharpd@cumulusnetworks.com>

Tue, 13 Nov 2018 14:20:22 +0000 (09:20 -0500)

committer GitHub <noreply@github.com>

Tue, 13 Nov 2018 14:20:22 +0000 (09:20 -0500)
author Donald Sharp <sharpd@cumulusnetworks.com>
Tue, 13 Nov 2018 14:20:22 +0000 (09:20 -0500)
committer GitHub <noreply@github.com>
Tue, 13 Nov 2018 14:20:22 +0000 (09:20 -0500)
diff --cc bgpd/bgpd.c
Simple merge
diff --cc tests/.gitignore
Simple merge
diff --cc tests/subdir.am
Simple merge
author	Donald Sharp <sharpd@cumulusnetworks.com>
	Tue, 13 Nov 2018 14:20:22 +0000 (09:20 -0500)
committer	GitHub <noreply@github.com>
	Tue, 13 Nov 2018 14:20:22 +0000 (09:20 -0500)
		1	2
bgpd/bgpd.c	patch \|	diff1 \|	diff2 \|	blob \| history
tests/.gitignore	patch \|	diff1 \|	diff2 \|	blob \| history
tests/subdir.am	patch \|	diff1 \|	diff2 \|	blob \| history