Merge "Containerized mongodb, disable by default, fix upgrade" into stable/pike
authorJenkins <jenkins@review.openstack.org>
Thu, 7 Sep 2017 05:34:35 +0000 (05:34 +0000)
committerGerrit Code Review <review@openstack.org>
Thu, 7 Sep 2017 05:34:35 +0000 (05:34 +0000)

Trivial merge