Merge "Ensure compute nodes use internalURL as catalog_info"
authorJenkins <jenkins@review.openstack.org>
Mon, 20 Jul 2015 11:27:18 +0000 (11:27 +0000)
committerGerrit Code Review <review@openstack.org>
Mon, 20 Jul 2015 11:27:18 +0000 (11:27 +0000)

Trivial merge