tree b3a70cff72f0395c6150ef42df20b7ced1f1fdb4
parent 5891bd868a3ed727dad29e50e0490f2220839a91
parent d034daa9c4737cdc650090916100e2c4ad1f2b43
author Simon Pasquier <spasquier@mirantis.com> 1480087120 +0100
committer Simon Pasquier <spasquier@mirantis.com> 1480087147 +0100

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

Change-Id: I19d1d259d80d614fd49e40fda0f6bb4521020772