tree 752b71effef5ea550226bab13f3aeff35a3e631c
parent 54d3426ff274c7b43ca4dff74989f47ef0db5f8a
parent 706b47df4982540ec1b3811207a8198fc5643935
author Jenkins <jenkins@review.openstack.org> 1479466945 +0000
committer Gerrit Code Review <review@openstack.org> 1479466945 +0000

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