[1] http://lists.openstack.org/pipermail/openstack-discuss/2020-October/018445.html Conflicts: .zuul.yaml lower-constraints.txt Changes: bindep.txt NOTE(stephenfin): Conflicts are due to the changed job template (ussuri vs victoria) and slightly different lower constraints between branches. We also need to remove 'libffi6' from 'bindep.txt' since Focal doesn't have this. This was done in the Victoria cycle as part of change Iab3634039845adb649c7fd69d1812b405a61433c but we must squash it in here. Change-Id: I45e9a81d451c64cdd51f9b606d94161742bacdb7 (cherry picked from commitc677192d51) (cherry picked from commitcde8db3d61) (cherry picked from commit40f56c653c) (cherry picked from commit84af7608ef)
405 B
405 B