tree 4a861479a91f7fffb1bbee062377411a5c421255
parent 5f3632c2ae2c12ea6380ae22e6c6a6cc397b4b1f
parent 39c4ce4d2a061cc33b225d25102d6e9149db9bca
author Jenkins <jenkins@review.openstack.org> 1455879046 +0000
committer Gerrit Code Review <review@openstack.org> 1455879046 +0000

Merge "Hook into environment merging on server"