Merge "Enable internal TLS for Barbican API"
authorJenkins <jenkins@review.openstack.org>
Tue, 15 Nov 2016 18:25:02 +0000 (18:25 +0000)
committerGerrit Code Review <review@openstack.org>
Tue, 15 Nov 2016 18:25:02 +0000 (18:25 +0000)

Trivial merge