Merge "Merge the nova HAproxy TLS options"
authorJenkins <jenkins@review.openstack.org>
Fri, 30 Jun 2017 11:27:06 +0000 (11:27 +0000)
committerGerrit Code Review <review@openstack.org>
Fri, 30 Jun 2017 11:27:06 +0000 (11:27 +0000)

Trivial merge