| commit | f158af4047eba1c407e24f8580704a4057d16666 | [log] [tgz] |
|---|---|---|
| author | Jenkins <jenkins@review.openstack.org> | Fri Nov 18 11:04:06 2016 +0000 |
| committer | Gerrit Code Review <review@openstack.org> | Fri Nov 18 11:04:06 2016 +0000 |
| tree | dd73e747eb4a2fedd1cdd3e597cb3bdc6c5f6131 | |
| parent | c1239cfbc92b1ad2d974d924c2aef3ebd85e4b7e [diff] | |
| parent | 46dda8f973a9771896d4ab3a322fa78e24b5e0f1 [diff] |
Merge "Merge remote-tracking branch 'upstream/master' into merge-branch" into stacklight