| commit | 046e93f68aca2dc0e02cf667052b210330fecc88 | [log] [tgz] |
|---|---|---|
| author | Simon Pasquier <spasquier@mirantis.com> | Fri Nov 25 16:18:42 2016 +0100 |
| committer | Simon Pasquier <spasquier@mirantis.com> | Fri Nov 25 16:19:07 2016 +0100 |
| tree | 3f925359a0bacd4e97051dd2bcce0a1de19e4156 | |
| parent | 95ceb4b761bc18352e7dc2353fd6379fad3dab9f [diff] | |
| parent | b5b5017385d2d32833148da2b97d25c2fd94762f [diff] |
Merge remote-tracking branch 'upstream/stacklight' into merge-branch Change-Id: I2311c266acb6b26e4acbb50958ae76714797d77a