Merge "Add docker heat services"
authorJenkins <jenkins@review.openstack.org>
Wed, 22 Feb 2017 20:25:42 +0000 (20:25 +0000)
committerGerrit Code Review <review@openstack.org>
Wed, 22 Feb 2017 20:25:42 +0000 (20:25 +0000)

Trivial merge