Merge "Use parameter_defaults in env files"
authorJenkins <jenkins@review.openstack.org>
Sun, 19 Jul 2015 00:45:10 +0000 (00:45 +0000)
committerGerrit Code Review <review@openstack.org>
Sun, 19 Jul 2015 00:45:10 +0000 (00:45 +0000)

Trivial merge