tree 970d63d4345d0e18f1a118ad2ba54e11025550a9
parent db0604b7c6b2f1cc54b71a9eef035090dc4e66b2
parent 8681e92a66f8cb87c6a7ffbf52150f4989219ad9
author Jenkins <jenkins@review.openstack.org> 1409307304 +0000
committer Gerrit Code Review <review@openstack.org> 1409307304 +0000

Merge "Rename Marconi to Zaqar"