| commit | d29818bf2ffbe0c1ce59dbfbcbe0463709b4b655 | [log] [tgz] |
|---|---|---|
| author | Jenkins <jenkins@review.openstack.org> | Fri Nov 18 11:02:57 2016 +0000 |
| committer | Gerrit Code Review <review@openstack.org> | Fri Nov 18 11:02:57 2016 +0000 |
| tree | 67e72f0589b030240bef34180ad8eb3bc21135a0 | |
| parent | 981dd2340e1b12d86358551225d72ebd34100fd9 [diff] | |
| parent | d6d5154a39386751c4416adf9e9a22a2753a5c86 [diff] |
Merge "Merge remote-tracking branch 'upstream/master' into merge-branch" into stacklight