commit | 8b6a5c4964048405e938ddf5f1c6b5c4176d0bf7 | [log] [tgz] |
---|---|---|
author | Simon Pasquier <spasquier@mirantis.com> | Fri Nov 25 16:18:32 2016 +0100 |
committer | Simon Pasquier <spasquier@mirantis.com> | Fri Nov 25 16:19:07 2016 +0100 |
tree | 20e5c999890c1486dc385d139bc3dc5e97b773b2 | |
parent | 2d63c9875c41c1b131eec4c341b33b05866a4e2f [diff] | |
parent | 5f189b6cfef7354958e960b48aaf6b315e1a1bb5 [diff] |
Merge remote-tracking branch 'upstream/stacklight' into merge-branch Change-Id: I1dda55c0317a4df6ffea1fa11d521941328fc1e6