Merge "etcd: Make HAProxy terminate TLS connections"
authorJenkins <jenkins@review.openstack.org>
Thu, 13 Apr 2017 15:20:28 +0000 (15:20 +0000)
committerGerrit Code Review <review@openstack.org>
Thu, 13 Apr 2017 15:20:28 +0000 (15:20 +0000)

Trivial merge