)]}'
{"/COMMIT_MSG":[{"author":{"_account_id":17685,"name":"Elod Illes","email":"elod.illes@est.tech","username":"elod.illes"},"change_message_id":"b151260af2c5c249617dd3642aa9e9f33003b59d","unresolved":false,"context_lines":[{"line_number":73,"context_line":"2025.1 Conflicts:"},{"line_number":74,"context_line":"  nova/compute/pci_placement_translator.py"},{"line_number":75,"context_line":"  nova/tests/unit/compute/test_pci_placement_translator.py"},{"line_number":76,"context_line":"  both is due to OTU feature not exists in 2025.1"},{"line_number":77,"context_line":""},{"line_number":78,"context_line":"Closes-Bug: #2115905"},{"line_number":79,"context_line":"Change-Id: Ie9d311ea9f59ff49593003e3773b690dd36fdeb2"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":1,"id":"eb9d7929_1fbda82f","line":76,"updated":"2025-09-09 13:56:03.000000000","message":"thanks, indeed, it seems that patch Idfe8a746a97d68cd4eae30afb7d22f4e3af80327 (OTU feature) causes the conflicts. (with that patch cherry picked to stable/2025.1 the cherry pick of this fix from master would be a clean one)","commit_id":"78be1679312768383b684fa70ca4d2f5c4e35fa9"}],"/PATCHSET_LEVEL":[{"author":{"_account_id":9708,"name":"Balazs Gibizer","display_name":"gibi","email":"gibizer@gmail.com","username":"gibi"},"change_message_id":"4485a37c3dc1499000d0010fa9d903a7bf4451f6","unresolved":false,"context_lines":[],"source_content_type":"","patch_set":1,"id":"2dc583b1_4fa3a396","updated":"2025-10-08 11:58:16.000000000","message":"recheck","commit_id":"78be1679312768383b684fa70ca4d2f5c4e35fa9"},{"author":{"_account_id":9708,"name":"Balazs Gibizer","display_name":"gibi","email":"gibizer@gmail.com","username":"gibi"},"change_message_id":"5b48bfc98454439f38ab1c356f75a1de81315366","unresolved":false,"context_lines":[],"source_content_type":"","patch_set":1,"id":"6a66f7b4_15903d0b","updated":"2025-09-19 12:11:29.000000000","message":"recheck parent requeued","commit_id":"78be1679312768383b684fa70ca4d2f5c4e35fa9"},{"author":{"_account_id":9708,"name":"Balazs Gibizer","display_name":"gibi","email":"gibizer@gmail.com","username":"gibi"},"change_message_id":"541de21ea84669813207e34e6dd2891ad031d732","unresolved":false,"context_lines":[],"source_content_type":"","patch_set":1,"id":"af1eb163_c57a7b88","updated":"2025-09-09 12:25:40.000000000","message":"recheck tempest failed with ssh timeout to guest, guest probably started too slow","commit_id":"78be1679312768383b684fa70ca4d2f5c4e35fa9"},{"author":{"_account_id":17685,"name":"Elod Illes","email":"elod.illes@est.tech","username":"elod.illes"},"change_message_id":"b151260af2c5c249617dd3642aa9e9f33003b59d","unresolved":false,"context_lines":[],"source_content_type":"","patch_set":1,"id":"c5714da4_8427e638","updated":"2025-09-09 13:56:03.000000000","message":"this was a bit complex, indeed, as the commit message says :] but as far as I could track the changes between the bug fix on master and here, it looks like the conflicts are resolved correctly. furthermore, all the relevant tests are passing, so this looks good to me. original patch merged on master.","commit_id":"78be1679312768383b684fa70ca4d2f5c4e35fa9"}]}