tree d4028df0915544ab7db1c520dec9e44798cf5470
parent a1f2d83e3455c1ca0263f4104411da8a3cc85bbe
parent af12a5d1bad746e4ef991481cefca90fc2c8fa78
author Simon Pasquier <spasquier@mirantis.com> 1480087128 +0100
committer Simon Pasquier <spasquier@mirantis.com> 1480087148 +0100

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

Change-Id: Ieb84b718642a0d71cc37bb4a2b8365605b28ed25