tree 264ff148dc7826868eef62ae6214fc28ca06236d
parent 9bad1a4d91fc91064975fbe6acddf7393a0a49af
parent 0faa853b62a691766f7a7a7a8afcbe27128440b7
author Simon Pasquier <spasquier@mirantis.com> 1479465872 +0100
committer Simon Pasquier <spasquier@mirantis.com> 1479465875 +0100

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

Change-Id: I53a595b819bfcba7850ed9a31a005af6af2f6732