| commit | 96a8ed3c846e3f15ced12fce6412cf058318c0ff | [log] [tgz] |
|---|---|---|
| author | Simon Pasquier <spasquier@mirantis.com> | Fri Nov 25 16:18:46 2016 +0100 |
| committer | Simon Pasquier <spasquier@mirantis.com> | Fri Nov 25 16:19:08 2016 +0100 |
| tree | 314d0a66ada7e3286d320cf9081a8dd352557b55 | |
| parent | 6d39fc0c19a81161147de250434d5689c6ea559f [diff] | |
| parent | 63ef2d583c733ac59e7598696c9ff076f64c9c06 [diff] |
Merge remote-tracking branch 'upstream/stacklight' into merge-branch Change-Id: I02375439dce9dca8098c64768d8483cb9e47820d