Merge "Add DockerPuppetProcessCount defaults to 3" into stable/pike
authorJenkins <jenkins@review.openstack.org>
Thu, 31 Aug 2017 00:24:53 +0000 (00:24 +0000)
committerGerrit Code Review <review@openstack.org>
Thu, 31 Aug 2017 00:24:53 +0000 (00:24 +0000)

Trivial merge