| commit | af37e09a42a3c41caeab44d2f5e4199e7a4dc2e1 | [log] [tgz] |
|---|---|---|
| author | Simon Pasquier <spasquier@mirantis.com> | Fri Nov 25 16:18:44 2016 +0100 |
| committer | Simon Pasquier <spasquier@mirantis.com> | Fri Nov 25 16:19:07 2016 +0100 |
| tree | bf5a162bd04052276032bd0640787e9eb3a28770 | |
| parent | 74f61118e5efcc94a2494328fa8a708f26df8863 [diff] | |
| parent | f3c617b5c0d8873541bd7fd39363766f98be50cd [diff] |
Merge remote-tracking branch 'upstream/stacklight' into merge-branch Change-Id: I88df0eadd7501501edfbea67d79e63b52be48b8e