Merge remote-tracking branch 'origin/master' into EIGRP

author Donald Sharp <sharpd@cumulusnetworks.com>

Wed, 26 Apr 2017 12:03:54 +0000 (08:03 -0400)

committer Donald Sharp <sharpd@cumulusnetworks.com>

Wed, 26 Apr 2017 12:03:54 +0000 (08:03 -0400)
author Donald Sharp <sharpd@cumulusnetworks.com>
Wed, 26 Apr 2017 12:03:54 +0000 (08:03 -0400)
committer Donald Sharp <sharpd@cumulusnetworks.com>
Wed, 26 Apr 2017 12:03:54 +0000 (08:03 -0400)
diff --cc configure.ac
Simple merge
diff --cc vtysh/vtysh.c
Simple merge
author	Donald Sharp <sharpd@cumulusnetworks.com>
	Wed, 26 Apr 2017 12:03:54 +0000 (08:03 -0400)
committer	Donald Sharp <sharpd@cumulusnetworks.com>
	Wed, 26 Apr 2017 12:03:54 +0000 (08:03 -0400)
		1	2
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history
vtysh/vtysh.c	patch \|	diff1 \|	diff2 \|	blob \| history