| commit | f4ed45166b9fbf590882b15729c4cf21f9ac93c3 | [log] [tgz] |
|---|---|---|
| author | Simon Pasquier <spasquier@mirantis.com> | Fri Nov 25 16:18:40 2016 +0100 |
| committer | Simon Pasquier <spasquier@mirantis.com> | Fri Nov 25 16:19:07 2016 +0100 |
| tree | b3a70cff72f0395c6150ef42df20b7ced1f1fdb4 | |
| parent | 5891bd868a3ed727dad29e50e0490f2220839a91 [diff] | |
| parent | d034daa9c4737cdc650090916100e2c4ad1f2b43 [diff] |
Merge remote-tracking branch 'upstream/stacklight' into merge-branch Change-Id: I19d1d259d80d614fd49e40fda0f6bb4521020772