Merge "Added support for custom images and flavors in tempest"
authorMorgan Richomme <morgan.richomme@orange.com>
Fri, 16 Sep 2016 08:54:06 +0000 (08:54 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Fri, 16 Sep 2016 08:54:07 +0000 (08:54 +0000)

Trivial merge