tree 6c03870142919ed59dbb4d165bb5931089a77ffe
parent 02ed6bbb2bc4471a30b51a11496c3b570b1f6d7f
parent ea178f642fb758ac741f284ac34fbff9e8c10869
author Simon Pasquier <spasquier@mirantis.com> 1479466785 +0100
committer Simon Pasquier <spasquier@mirantis.com> 1479466801 +0100

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

Change-Id: I7e75a984ab7b863f5ea4fb6b781391beec03102c