Merge "Remove duplicate docker/puppet services.yaml"
authorJenkins <jenkins@review.openstack.org>
Sat, 17 Jun 2017 09:46:33 +0000 (09:46 +0000)
committerGerrit Code Review <review@openstack.org>
Sat, 17 Jun 2017 09:46:33 +0000 (09:46 +0000)
1  2 
environments/docker.yaml
overcloud-resource-registry-puppet.j2.yaml

Simple merge