commit | eee136dcd29832dfff7e30b386bb8e9f85d76732 | [log] [tgz] |
---|---|---|
author | Jenkins <jenkins@review.openstack.org> | Fri Nov 18 11:02:25 2016 +0000 |
committer | Gerrit Code Review <review@openstack.org> | Fri Nov 18 11:02:25 2016 +0000 |
tree | 752b71effef5ea550226bab13f3aeff35a3e631c | |
parent | 54d3426ff274c7b43ca4dff74989f47ef0db5f8a [diff] | |
parent | 706b47df4982540ec1b3811207a8198fc5643935 [diff] |
Merge "Merge remote-tracking branch 'upstream/master' into merge-branch" into stacklight