tree 083d9e425aa834bf99b3ff02beed034a02965ea3
parent aff09291dde986ad37b8442a40ea441996057644
parent d2a3f4e76568b31256694bd98d8b71f2aaf0a08b
author Jenkins <jenkins@review.openstack.org> 1479466957 +0000
committer Gerrit Code Review <review@openstack.org> 1479466957 +0000

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