Merge "Removing WARNING: line has more than 140 characters in puppet-tripleo profiles"

author Jenkins <jenkins@review.openstack.org>

Mon, 29 Aug 2016 15:21:14 +0000 (15:21 +0000)

committer Gerrit Code Review <review@openstack.org>

Mon, 29 Aug 2016 15:21:14 +0000 (15:21 +0000)
author Jenkins <jenkins@review.openstack.org>
Mon, 29 Aug 2016 15:21:14 +0000 (15:21 +0000)
committer Gerrit Code Review <review@openstack.org>
Mon, 29 Aug 2016 15:21:14 +0000 (15:21 +0000)
diff --cc manifests/haproxy.pp
Simple merge
diff --cc manifests/profile/pacemaker/database/mysql.pp
Simple merge
author	Jenkins <jenkins@review.openstack.org>
	Mon, 29 Aug 2016 15:21:14 +0000 (15:21 +0000)
committer	Gerrit Code Review <review@openstack.org>
	Mon, 29 Aug 2016 15:21:14 +0000 (15:21 +0000)
		1	2
manifests/haproxy.pp	patch \|	diff1 \|	diff2 \|	blob \| history
manifests/profile/pacemaker/database/mysql.pp	patch \|	diff1 \|	diff2 \|	blob \| history