Merge "ec2-api: Get FQDN from hiera instead of puppet fact"
authorJenkins <jenkins@review.openstack.org>
Mon, 6 Mar 2017 12:18:57 +0000 (12:18 +0000)
committerGerrit Code Review <review@openstack.org>
Mon, 6 Mar 2017 12:18:57 +0000 (12:18 +0000)

Trivial merge