Merge "Retain existing ComputeHostnameFormat when upgrading older envs"
authorJenkins <jenkins@review.openstack.org>
Wed, 10 Aug 2016 08:48:12 +0000 (08:48 +0000)
committerGerrit Code Review <review@openstack.org>
Wed, 10 Aug 2016 08:48:12 +0000 (08:48 +0000)

Trivial merge