Merge "Use create-legacy-resource-types during gnocchi-upgrade"
authorJenkins <jenkins@review.openstack.org>
Tue, 5 Jul 2016 14:05:36 +0000 (14:05 +0000)
committerGerrit Code Review <review@openstack.org>
Tue, 5 Jul 2016 14:05:36 +0000 (14:05 +0000)
1  2 
puppet/hieradata/controller.yaml

Simple merge