Merge "Adds the puppet-tripleo manifests for manila"
authorJenkins <jenkins@review.openstack.org>
Mon, 6 Jun 2016 12:23:08 +0000 (12:23 +0000)
committerGerrit Code Review <review@openstack.org>
Mon, 6 Jun 2016 12:23:08 +0000 (12:23 +0000)

Trivial merge