tree 3f925359a0bacd4e97051dd2bcce0a1de19e4156
parent 95ceb4b761bc18352e7dc2353fd6379fad3dab9f
parent b5b5017385d2d32833148da2b97d25c2fd94762f
author Simon Pasquier <spasquier@mirantis.com> 1480087122 +0100
committer Simon Pasquier <spasquier@mirantis.com> 1480087147 +0100

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

Change-Id: I2311c266acb6b26e4acbb50958ae76714797d77a