| commit | 6fca449e7b416927838b8a08d52d9a932e665aed | [log] [tgz] |
|---|---|---|
| author | Zuul <zuul@review.openstack.org> | Wed Dec 06 18:34:17 2017 +0000 |
| committer | Gerrit Code Review <review@openstack.org> | Wed Dec 06 18:34:17 2017 +0000 |
| tree | 8ef0b30b9ae835574d846990ac92433ee9395449 | |
| parent | 748a6f8b60b9f2daac3f5ad0bba0c0385c88eed5 [diff] | |
| parent | 7207c89dde5e9ce69626e5d1d83914aea0d5f049 [diff] |
Merge "Fix mixed canonical/non-canonical project merge" into feature/zuulv3