tree 20e5c999890c1486dc385d139bc3dc5e97b773b2
parent 2d63c9875c41c1b131eec4c341b33b05866a4e2f
parent 5f189b6cfef7354958e960b48aaf6b315e1a1bb5
author Simon Pasquier <spasquier@mirantis.com> 1480087112 +0100
committer Simon Pasquier <spasquier@mirantis.com> 1480087147 +0100

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

Change-Id: I1dda55c0317a4df6ffea1fa11d521941328fc1e6