tree 2eb1a89dfbd66a48735f4d783ed2d97e5058f93d
parent 43d8fe5f8a9146e256287e3bb630b218ee7536f5
parent 2d63c9875c41c1b131eec4c341b33b05866a4e2f
author Simon Pasquier <spasquier@mirantis.com> 1479465720 +0100
committer Simon Pasquier <spasquier@mirantis.com> 1479465726 +0100

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

Change-Id: Iaf98d962782f065f6ab383b914ebb05cdbf4771d