Merge "Move resource registry override to enable-tls.yaml"
authorJenkins <jenkins@review.openstack.org>
Thu, 25 Aug 2016 06:11:04 +0000 (06:11 +0000)
committerGerrit Code Review <review@openstack.org>
Thu, 25 Aug 2016 06:11:04 +0000 (06:11 +0000)

Trivial merge