| commit | 83bdd100db3988787aa30e2c066a8b7694ece52d | [log] [tgz] |
|---|---|---|
| author | Simon Pasquier <spasquier@mirantis.com> | Thu Nov 24 17:10:11 2016 +0100 |
| committer | Simon Pasquier <spasquier@mirantis.com> | Thu Nov 24 17:10:11 2016 +0100 |
| tree | 30ed67721b1634f501d2c73d3520d99854516764 | |
| parent | 201046154df3750a3ace59a068a267bcb2e635ce [diff] | |
| parent | 74f02e17ebfa4e61f531201cc850a7037c6d84ac [diff] |
Merge remote-tracking branch 'upstream/master' into stacklight