tree c8d15ded401cb4430e5814d4a883ca12f8321e3a
parent 4e3c0a107c4e26b2b37b2217096563d7d21fd2c2
parent a1f2d83e3455c1ca0263f4104411da8a3cc85bbe
author Simon Pasquier <spasquier@mirantis.com> 1480001523 +0100
committer Simon Pasquier <spasquier@mirantis.com> 1480001545 +0100

Merge remote-tracking branch 'upstream/master' into merge-branch

Change-Id: If7690fd215012ed2252528ec99a66eaff193928a