tree 18651d7a7ced73ebb109eba83e67ea8642f7cd7c
parent 772ccfd1fff975fb177189853cd61b228b3b27ba
parent 21904b5519255d3ff246b0be6e72a8a1be38a468
author Jenkins <jenkins@review.openstack.org> 1471935269 +0000
committer Gerrit Code Review <review@openstack.org> 1471935269 +0000

Merge "Use tempest.conf when running under tempest"