| commit | 2503d623dd2ad3becf562260bd354feb51671142 | [log] [tgz] |
|---|---|---|
| author | Jenkins <jenkins@review.openstack.org> | Fri Nov 18 11:02:37 2016 +0000 |
| committer | Gerrit Code Review <review@openstack.org> | Fri Nov 18 11:02:37 2016 +0000 |
| tree | 083d9e425aa834bf99b3ff02beed034a02965ea3 | |
| parent | aff09291dde986ad37b8442a40ea441996057644 [diff] | |
| parent | d2a3f4e76568b31256694bd98d8b71f2aaf0a08b [diff] |
Merge "Merge remote-tracking branch 'upstream/master' into merge-branch" into stacklight