Merge "New environment file to configure containers."
authorJenkins <jenkins@review.openstack.org>
Wed, 5 Jul 2017 00:35:31 +0000 (00:35 +0000)
committerGerrit Code Review <review@openstack.org>
Wed, 5 Jul 2017 00:35:31 +0000 (00:35 +0000)

Trivial merge