tree bf5a162bd04052276032bd0640787e9eb3a28770
parent 74f61118e5efcc94a2494328fa8a708f26df8863
parent f3c617b5c0d8873541bd7fd39363766f98be50cd
author Simon Pasquier <spasquier@mirantis.com> 1480087124 +0100
committer Simon Pasquier <spasquier@mirantis.com> 1480087147 +0100

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

Change-Id: I88df0eadd7501501edfbea67d79e63b52be48b8e