Merge "Sample environment generator"
authorJenkins <jenkins@review.openstack.org>
Wed, 14 Jun 2017 21:15:53 +0000 (21:15 +0000)
committerGerrit Code Review <review@openstack.org>
Wed, 14 Jun 2017 21:15:53 +0000 (21:15 +0000)

Trivial merge