Fix #1' (slightly different version of fix #1, but not the same as fixes #1 + #2 combined) was proposed on 5/23 and merged to stable/5.0 on 5/26: https://review.openstack.org/95153
The end result is:
- master has both fixes #1 and #2
- stable/5.0 has neither fix, and none proposed
- stable/4.1 has fix #1 merged and fix #2 proposed
My assumption would be that fix #2 for stable/4.1 should be merged, fix #1 (original version, not #1') should be re-proposed for stable/5.0, and fix #2 should be also be backported to stable/5.0. Please confirm and propose missing fixes for stable/5.0, or explain what else is missing.
The story of this bug as far as I could decypher from git & gerrit:
Fix #1 was merged to 5.1 master on 5/23: /review. openstack. org/95096
https:/
Fix #1' (slightly different version of fix #1, but not the same as fixes #1 + #2 combined) was proposed on 5/23 and merged to stable/5.0 on 5/26: /review. openstack. org/95153
https:/
Fix #1' was reverted from stable/5.0 on 5/26: /review. openstack. org/95606
https:/
Fix #1 (original version) was cherry-picked on 6/18 and merged to stable/4.1 on 6/23: /review. openstack. org/100923
https:/
Fix #2 was merged to 5.1 master on 6/19: /review. openstack. org/100962
https:/
Fix #2 was proposed to stable/4.1 on 6/24: /review. openstack. org/102252
https:/
The end result is:
- master has both fixes #1 and #2
- stable/5.0 has neither fix, and none proposed
- stable/4.1 has fix #1 merged and fix #2 proposed
My assumption would be that fix #2 for stable/4.1 should be merged, fix #1 (original version, not #1') should be re-proposed for stable/5.0, and fix #2 should be also be backported to stable/5.0. Please confirm and propose missing fixes for stable/5.0, or explain what else is missing.