Merge "Open tripleo-heat-templates for Ocata"
authorJenkins <jenkins@review.openstack.org>
Wed, 5 Oct 2016 21:47:47 +0000 (21:47 +0000)
committerGerrit Code Review <review@openstack.org>
Wed, 5 Oct 2016 21:47:47 +0000 (21:47 +0000)

Trivial merge