Merge "Add TLS proxy resource"
authorJenkins <jenkins@review.openstack.org>
Thu, 22 Dec 2016 22:12:41 +0000 (22:12 +0000)
committerGerrit Code Review <review@openstack.org>
Thu, 22 Dec 2016 22:12:41 +0000 (22:12 +0000)

Trivial merge