tree d1c5787b838751bd20143e931d45d88e862429f9
parent 3be07391d885eea5cd72cd6e821d0717f8b531b0
parent 6459db123a86bb98d88b6f98b81afa12dad29678
author Jenkins <jenkins@review.openstack.org> 1499742670 +0000
committer Gerrit Code Review <review@openstack.org> 1499742670 +0000

Merge "Permit config shadowing" into feature/zuulv3