Merge "Docker compute role configured via Puppet"
authorJenkins <jenkins@review.openstack.org>
Fri, 9 Oct 2015 19:09:01 +0000 (19:09 +0000)
committerGerrit Code Review <review@openstack.org>
Fri, 9 Oct 2015 19:09:01 +0000 (19:09 +0000)

Trivial merge