Merge "Fix resource_registry path in enable-internal-tls"
authorJenkins <jenkins@review.openstack.org>
Wed, 23 Nov 2016 15:27:08 +0000 (15:27 +0000)
committerGerrit Code Review <review@openstack.org>
Wed, 23 Nov 2016 15:27:08 +0000 (15:27 +0000)

Trivial merge