Merge pull request #2652 from LabNConsulting/working/master/confdate_cleanup

author Donald Sharp <sharpd@cumulusnetworks.com>

Mon, 23 Jul 2018 12:46:26 +0000 (08:46 -0400)

committer GitHub <noreply@github.com>

Mon, 23 Jul 2018 12:46:26 +0000 (08:46 -0400)
author Donald Sharp <sharpd@cumulusnetworks.com>
Mon, 23 Jul 2018 12:46:26 +0000 (08:46 -0400)
committer GitHub <noreply@github.com>
Mon, 23 Jul 2018 12:46:26 +0000 (08:46 -0400)
diff --cc Makefile.am
Simple merge
diff --cc bgpd/bgp_vty.c
Simple merge
diff --cc configure.ac
Simple merge
author	Donald Sharp <sharpd@cumulusnetworks.com>
	Mon, 23 Jul 2018 12:46:26 +0000 (08:46 -0400)
committer	GitHub <noreply@github.com>
	Mon, 23 Jul 2018 12:46:26 +0000 (08:46 -0400)
		1	2
Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history
bgpd/bgp_vty.c	patch \|	diff1 \|	diff2 \|	blob \| history
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history