Merge "Pass parameters for TLS proxy in front of Glance-API"
authorJenkins <jenkins@review.openstack.org>
Tue, 24 Jan 2017 23:13:12 +0000 (23:13 +0000)
committerGerrit Code Review <review@openstack.org>
Tue, 24 Jan 2017 23:13:12 +0000 (23:13 +0000)

Trivial merge