Merge "Add/Update tempest.conf via a specific file"
authorMorgan Richomme <morgan.richomme@orange.com>
Thu, 10 Aug 2017 08:56:10 +0000 (08:56 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Thu, 10 Aug 2017 08:56:10 +0000 (08:56 +0000)

Trivial merge