| commit | 5b13cd60c692b0aeb15fa6a77b8b4feb23b4da8f | [log] [tgz] |
|---|---|---|
| author | Simon Pasquier <spasquier@mirantis.com> | Fri Nov 25 16:18:48 2016 +0100 |
| committer | Simon Pasquier <spasquier@mirantis.com> | Fri Nov 25 16:19:08 2016 +0100 |
| tree | d4028df0915544ab7db1c520dec9e44798cf5470 | |
| parent | a1f2d83e3455c1ca0263f4104411da8a3cc85bbe [diff] | |
| parent | af12a5d1bad746e4ef991481cefca90fc2c8fa78 [diff] |
Merge remote-tracking branch 'upstream/stacklight' into merge-branch Change-Id: Ieb84b718642a0d71cc37bb4a2b8365605b28ed25