tree a5fef922fd1e160b5e2d5c8aa5d8e3ed362d670e
parent 6a66e52d2fad9b6311cd39e0ec8b502c7656dceb
parent 6e7b3b8f13c175042a93aef177a5a9dfd532c694
author Jenkins <jenkins@review.openstack.org> 1394601962 +0000
committer Gerrit Code Review <review@openstack.org> 1394601962 +0000

Merge "Adds basic Marconi test"