Merge "Enable internal network TLS for etcd"

author Jenkins <jenkins@review.openstack.org>

Tue, 25 Apr 2017 17:33:53 +0000 (17:33 +0000)

committer Gerrit Code Review <review@openstack.org>

Tue, 25 Apr 2017 17:33:53 +0000 (17:33 +0000)
author Jenkins <jenkins@review.openstack.org>
Tue, 25 Apr 2017 17:33:53 +0000 (17:33 +0000)
committer Gerrit Code Review <review@openstack.org>
Tue, 25 Apr 2017 17:33:53 +0000 (17:33 +0000)
diff --cc manifests/haproxy.pp
Simple merge
diff --cc manifests/profile/base/certmonger_user.pp
Simple merge
author	Jenkins <jenkins@review.openstack.org>
	Tue, 25 Apr 2017 17:33:53 +0000 (17:33 +0000)
committer	Gerrit Code Review <review@openstack.org>
	Tue, 25 Apr 2017 17:33:53 +0000 (17:33 +0000)
		1	2
manifests/haproxy.pp	patch \|	diff1 \|	diff2 \|	blob \| history
manifests/profile/base/certmonger_user.pp	patch \|	diff1 \|	diff2 \|	blob \| history