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)
commita558b1e08dd3f8a0bccb70344586efdd9cbfa0a5
tree0240058394ad349b48aa095672f4b1cc306a875d
parent92c994deb8a3719cf7853f46b0aa0b52489fc368
parentde90b568fc39ac0b1c02dc3131cce718adfe8f3a
Merge "MidoNet heat templates"
puppet/compute.yaml
puppet/controller.yaml