tree 6cc5c0f4f4881fe89f4d82fb838e21c204ce2d56
parent e5a5fe33e09bd4e2604f86a20b21e78dd7be09b2
parent 38d1f2339a88c389e4be44fc00e59f25a62fec14
author Jenkins <jenkins@review.openstack.org> 1389658053 +0000
committer Gerrit Code Review <review@openstack.org> 1389658053 +0000

Merge "Add Marconi to Tempest config"