| commit | 46dda8f973a9771896d4ab3a322fa78e24b5e0f1 | [log] [tgz] |
|---|---|---|
| author | Simon Pasquier <spasquier@mirantis.com> | Fri Nov 18 11:58:56 2016 +0100 |
| committer | Simon Pasquier <spasquier@mirantis.com> | Fri Nov 18 11:59:00 2016 +0100 |
| tree | 0a66a668526de48749e049951cef41691bc11267 | |
| parent | 2b2e9c23266d738dd92d254ffe79fa641f4271a3 [diff] | |
| parent | 6d39fc0c19a81161147de250434d5689c6ea559f [diff] |
Merge remote-tracking branch 'upstream/master' into merge-branch Change-Id: Ie8eb16d22bfc8d8a582640dfb2c2ebf691507f7a