| commit | e06305ef94f91a2faa92db672365458c6a4ab71a | [log] [tgz] |
|---|---|---|
| author | Simon Pasquier <spasquier@mirantis.com> | Fri Nov 25 16:18:37 2016 +0100 |
| committer | Simon Pasquier <spasquier@mirantis.com> | Fri Nov 25 16:19:07 2016 +0100 |
| tree | 200fe15ec641584032b86ef5c6181cac4762fc47 | |
| parent | 0faa853b62a691766f7a7a7a8afcbe27128440b7 [diff] | |
| parent | 0208b959b43e90cd02c906891b6e2cf9270cdf23 [diff] |
Merge remote-tracking branch 'upstream/stacklight' into merge-branch Change-Id: Ie1756303965d4c384e8750ec0f43b36e2b583504