Merge remote-tracking branch 'origin/stable/2.0'

author Donald Sharp <sharpd@cumulusnetworks.com>

Thu, 9 Feb 2017 14:53:46 +0000 (09:53 -0500)

committer Donald Sharp <sharpd@cumulusnetworks.com>

Thu, 9 Feb 2017 14:53:46 +0000 (09:53 -0500)
author Donald Sharp <sharpd@cumulusnetworks.com>
Thu, 9 Feb 2017 14:53:46 +0000 (09:53 -0500)
committer Donald Sharp <sharpd@cumulusnetworks.com>
Thu, 9 Feb 2017 14:53:46 +0000 (09:53 -0500)
diff --cc lib/vty.h
Simple merge
diff --cc vtysh/vtysh.c
Simple merge
author	Donald Sharp <sharpd@cumulusnetworks.com>
	Thu, 9 Feb 2017 14:53:46 +0000 (09:53 -0500)
committer	Donald Sharp <sharpd@cumulusnetworks.com>
	Thu, 9 Feb 2017 14:53:46 +0000 (09:53 -0500)
		1	2
lib/vty.h	patch \|	diff1 \|	diff2 \|	blob \| history
vtysh/vtysh.c	patch \|	diff1 \|	diff2 \|	blob \| history