tree 67e72f0589b030240bef34180ad8eb3bc21135a0
parent 981dd2340e1b12d86358551225d72ebd34100fd9
parent d6d5154a39386751c4416adf9e9a22a2753a5c86
author Jenkins <jenkins@review.openstack.org> 1479466977 +0000
committer Gerrit Code Review <review@openstack.org> 1479466977 +0000

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