tree 314d0a66ada7e3286d320cf9081a8dd352557b55
parent 6d39fc0c19a81161147de250434d5689c6ea559f
parent 63ef2d583c733ac59e7598696c9ff076f64c9c06
author Simon Pasquier <spasquier@mirantis.com> 1480087126 +0100
committer Simon Pasquier <spasquier@mirantis.com> 1480087148 +0100

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

Change-Id: I02375439dce9dca8098c64768d8483cb9e47820d