)]}'
{"/COMMIT_MSG":[{"author":{"_account_id":17685,"name":"Elod Illes","email":"elod.illes@est.tech","username":"elod.illes"},"change_message_id":"ab705e32636d2c2e76bafb67e980a3b05acaa5a0","unresolved":false,"context_lines":[{"line_number":15,"context_line":""},{"line_number":16,"context_line":"Conflicts:"},{"line_number":17,"context_line":"  nova/compute/manager.py due to"},{"line_number":18,"context_line":"  5f515060f6c79f113f7b8107596e41056445c79f missing from stable/rocky"},{"line_number":19,"context_line":"  nova/tests/unit/compute/test_compute_mgr.py due to"},{"line_number":20,"context_line":"  35ce77835bb271bad3c18eaf22146edac3a42ea0 is missing from stable/rocky"},{"line_number":21,"context_line":""}],"source_content_type":"text/x-gerrit-commit-message","patch_set":1,"id":"ff570b3c_ae49818c","line":18,"range":{"start_line":18,"start_character":2,"end_line":18,"end_character":42},"updated":"2020-05-22 17:29:05.000000000","message":"actually 5f515060f6c79f113f7b8107596e41056445c79f (change-id: I29c5f491ec20a71283190a1599e7732541de736f) is there in Rocky, but I933687891abef4878de09481937d576ce5899511 is a stable-only patch in Rocky (and Queens), which causes the conflict.\n\nAs I understand that patch, it does not interfere with this fix, but could you please double check and reassure that?","commit_id":"cfbae1b9df506ff95746f5afb21bbe97c53a8ddb"},{"author":{"_account_id":9708,"name":"Balazs Gibizer","display_name":"gibi","email":"gibizer@gmail.com","username":"gibi"},"change_message_id":"220d29896a6f2600f91e41b1e658079dc967af75","unresolved":false,"context_lines":[{"line_number":15,"context_line":""},{"line_number":16,"context_line":"Conflicts:"},{"line_number":17,"context_line":"  nova/compute/manager.py due to"},{"line_number":18,"context_line":"  5f515060f6c79f113f7b8107596e41056445c79f missing from stable/rocky"},{"line_number":19,"context_line":"  nova/tests/unit/compute/test_compute_mgr.py due to"},{"line_number":20,"context_line":"  35ce77835bb271bad3c18eaf22146edac3a42ea0 is missing from stable/rocky"},{"line_number":21,"context_line":""}],"source_content_type":"text/x-gerrit-commit-message","patch_set":1,"id":"ff570b3c_3c1d9d0f","line":18,"range":{"start_line":18,"start_character":2,"end_line":18,"end_character":42},"in_reply_to":"ff570b3c_ae49818c","updated":"2020-05-25 08:03:22.000000000","message":"The listed patches does not interfere they just happen to change the lines next to this patch hence the conflict. You are right I93368 is the source of the conflict.","commit_id":"cfbae1b9df506ff95746f5afb21bbe97c53a8ddb"},{"author":{"_account_id":17685,"name":"Elod Illes","email":"elod.illes@est.tech","username":"elod.illes"},"change_message_id":"ab705e32636d2c2e76bafb67e980a3b05acaa5a0","unresolved":false,"context_lines":[{"line_number":17,"context_line":"  nova/compute/manager.py due to"},{"line_number":18,"context_line":"  5f515060f6c79f113f7b8107596e41056445c79f missing from stable/rocky"},{"line_number":19,"context_line":"  nova/tests/unit/compute/test_compute_mgr.py due to"},{"line_number":20,"context_line":"  35ce77835bb271bad3c18eaf22146edac3a42ea0 is missing from stable/rocky"},{"line_number":21,"context_line":""},{"line_number":22,"context_line":"Change-Id: Ic50e72e289b56ac54720ad0b719ceeb32487b8c8"},{"line_number":23,"context_line":"Closes-Bug: #1869050"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":1,"id":"ff570b3c_2eef31b1","line":20,"range":{"start_line":20,"start_character":2,"end_line":20,"end_character":42},"updated":"2020-05-22 17:29:05.000000000","message":"This is right (change-id: Ibb8c12fb2799bb5ceb9e3d72a2b86dbb4f14451e)","commit_id":"cfbae1b9df506ff95746f5afb21bbe97c53a8ddb"}]}