| commit | 212b5265ed261328e585920f77002eb57b38e863 | [log] [tgz] |
|---|---|---|
| author | Jenkins <jenkins@review.openstack.org> | Fri Nov 18 11:09:45 2016 +0000 |
| committer | Gerrit Code Review <review@openstack.org> | Fri Nov 18 11:09:45 2016 +0000 |
| tree | 2e4d55e3e5b1c20561bbe3448c3cb269d23e7ec6 | |
| parent | 1e152b28b9d5e63130a9e26d222dccaa5e560701 [diff] | |
| parent | 577a7cbc142390b64b129ba543d2c8bd142f9466 [diff] |
Merge "Merge remote-tracking branch 'upstream/master' into merge-branch" into stacklight