Merge "Don't delete failed docker-puppet containers"
authorJenkins <jenkins@review.openstack.org>
Wed, 17 May 2017 17:13:22 +0000 (17:13 +0000)
committerGerrit Code Review <review@openstack.org>
Wed, 17 May 2017 17:13:22 +0000 (17:13 +0000)

Trivial merge