Merge "Containerized nova-compute working with Deployed Server"
authorJenkins <jenkins@review.openstack.org>
Wed, 31 May 2017 10:05:58 +0000 (10:05 +0000)
committerGerrit Code Review <review@openstack.org>
Wed, 31 May 2017 10:05:58 +0000 (10:05 +0000)

Trivial merge