Merge "Template and role support for the undercloud"
authorJenkins <jenkins@review.openstack.org>
Mon, 9 Jan 2017 16:25:37 +0000 (16:25 +0000)
committerGerrit Code Review <review@openstack.org>
Mon, 9 Jan 2017 16:25:37 +0000 (16:25 +0000)

Trivial merge