[1] http://lists.openstack.org/pipermail/openstack-discuss/2020-October/018445.html Conflicts: .zuul.yaml bindep.txt lower-constraints.txt tox.ini NOTE(stephenfin): Conflicts are due to the changed job template (train vs ussuri), slightly different lower constraints between branches and presence of a 'basepython' line in the tox environment. The bindep change added to the stable/ussuri change is no longer relevant here. Change-Id: I45e9a81d451c64cdd51f9b606d94161742bacdb7 (cherry picked from commitc677192d51) (cherry picked from commitcde8db3d61) (cherry picked from commit40f56c653c) (cherry picked from commit84af7608ef) (cherry picked from commitdb92b96407)
5.0 KiB
5.0 KiB