Merge "MidoNet heat templates"
authorJenkins <jenkins@review.openstack.org>
Tue, 22 Dec 2015 07:45:33 +0000 (07:45 +0000)
committerGerrit Code Review <review@openstack.org>
Tue, 22 Dec 2015 07:45:33 +0000 (07:45 +0000)
1  2 
puppet/compute.yaml
puppet/controller.yaml

Simple merge
Simple merge