tree dd73e747eb4a2fedd1cdd3e597cb3bdc6c5f6131
parent c1239cfbc92b1ad2d974d924c2aef3ebd85e4b7e
parent 46dda8f973a9771896d4ab3a322fa78e24b5e0f1
author Jenkins <jenkins@review.openstack.org> 1479467046 +0000
committer Gerrit Code Review <review@openstack.org> 1479467046 +0000

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