tree 3b13258fe8243610cc45f0c5ee3310577b9d127d
parent a1a9e0b821bac81fec2c3529a644c8f7dcc185ed
parent 510d198883427b38995c473b88649ed6713f0e2e
author Zuul <zuul@review.openstack.org> 1503511665 +0000
committer Gerrit Code Review <review@openstack.org> 1503511665 +0000

Merge "Merge branch 'master' into feature/zuulv3" into feature/zuulv3