Merge "Have docker start script honor configuration"
authorJenkins <jenkins@review.openstack.org>
Fri, 21 Oct 2016 09:19:54 +0000 (09:19 +0000)
committerGerrit Code Review <review@openstack.org>
Fri, 21 Oct 2016 09:19:54 +0000 (09:19 +0000)

Trivial merge