tree 2e4d55e3e5b1c20561bbe3448c3cb269d23e7ec6
parent 1e152b28b9d5e63130a9e26d222dccaa5e560701
parent 577a7cbc142390b64b129ba543d2c8bd142f9466
author Jenkins <jenkins@review.openstack.org> 1479467385 +0000
committer Gerrit Code Review <review@openstack.org> 1479467385 +0000

Merge "Merge remote-tracking branch 'upstream/master' into merge-branch" into stacklight