)]}'
{"/COMMIT_MSG":[{"author":{"_account_id":17685,"name":"Elod Illes","email":"elod.illes@est.tech","username":"elod.illes"},"change_message_id":"36ba3949cc9e0d8d01d0d4c5260dfef7a82a8ec5","unresolved":false,"context_lines":[{"line_number":14,"context_line":"failover to a live host using `kombu_failover_strategy` and"},{"line_number":15,"context_line":"calling self.connection.maybe_switch_next()."},{"line_number":16,"context_line":""},{"line_number":17,"context_line":"Conflicts: oslo_messaging/_drivers/impl_rabbit.py"},{"line_number":18,"context_line":""},{"line_number":19,"context_line":"Assisted-By: claude-opus-4.6"},{"line_number":20,"context_line":"Closes-Bug: #2077152"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":1,"id":"5173b9cd_ea1c2a93","line":17,"updated":"2026-10-19 08:32:49.000000000","message":"conflict is due to patch I439b47e18884e44f11ca291df5e5256d907fa0fa that is a pyupgrade patch that we don\u0027t want to backport.","commit_id":"ca0936a07208994dd4274d53224053c5b0871047"}],"/PATCHSET_LEVEL":[{"author":{"_account_id":17685,"name":"Elod Illes","email":"elod.illes@est.tech","username":"elod.illes"},"change_message_id":"36ba3949cc9e0d8d01d0d4c5260dfef7a82a8ec5","unresolved":false,"context_lines":[],"source_content_type":"","patch_set":1,"id":"bb1bd014_858b1598","updated":"2026-10-19 08:32:49.000000000","message":"there is a small issue with the conflict resolution. see my comment inline.","commit_id":"ca0936a07208994dd4274d53224053c5b0871047"}],"oslo_messaging/_drivers/impl_rabbit.py":[{"author":{"_account_id":17685,"name":"Elod Illes","email":"elod.illes@est.tech","username":"elod.illes"},"change_message_id":"36ba3949cc9e0d8d01d0d4c5260dfef7a82a8ec5","unresolved":true,"context_lines":[{"line_number":1519,"context_line":"                try:"},{"line_number":1520,"context_line":"                    self.connection.drain_events(timeout\u003dpoll_timeout)"},{"line_number":1521,"context_line":"                    return"},{"line_number":1522,"context_line":"                except TimeoutError:"},{"line_number":1523,"context_line":"                    # Note(lajoskatona): Heartbeat check is only needed"},{"line_number":1524,"context_line":"                    # on timeout (idle connection). When drain_events"},{"line_number":1525,"context_line":"                    # returns successfully, the connection is clearly"}],"source_content_type":"text/x-python","patch_set":1,"id":"611d456e_9a0013f4","line":1522,"range":{"start_line":1522,"start_character":23,"end_line":1522,"end_character":35},"updated":"2026-10-19 08:32:49.000000000","message":"this is the conflicting part. this socket.timeout -\u003e TimeoutError is not part of the original patch. I\u0027d rather see this as `except socket.timeout:` to remain consistent with the rest of the code (however, this would work, even with older python versions, but better to remain consistent, in my opinion)","commit_id":"ca0936a07208994dd4274d53224053c5b0871047"}]}