)]}'
{"/COMMIT_MSG":[{"author":{"_account_id":11975,"name":"Slawek Kaplonski","email":"skaplons@redhat.com","username":"slaweq"},"change_message_id":"2eb86eb987955c75b88238fc17b2aeb37493abda","unresolved":true,"context_lines":[{"line_number":16,"context_line":"Related-Bug: #1918565"},{"line_number":17,"context_line":""},{"line_number":18,"context_line":"Conflicts:"},{"line_number":19,"context_line":"    neutron/tests/functional/objects/test_quota.py"},{"line_number":20,"context_line":""},{"line_number":21,"context_line":"Change-Id: I9284a6830ea103cb51a775fff720973852076770"},{"line_number":22,"context_line":"(cherry picked from commit 60b08896ab596be272e83c97be80ad62a3e2cbe4)"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":2,"id":"9377dfb4_ac82f716","line":19,"updated":"2021-03-24 13:12:46.000000000","message":"Just a question. How it conflicted as this file is just added by this patch?","commit_id":"ecdf1752e8dd15beeceba61a804e4c6ff5049053"},{"author":{"_account_id":11975,"name":"Slawek Kaplonski","email":"skaplons@redhat.com","username":"slaweq"},"change_message_id":"e3b0a5ad8e1359026138b026fccd4276b947a027","unresolved":true,"context_lines":[{"line_number":16,"context_line":"Related-Bug: #1918565"},{"line_number":17,"context_line":""},{"line_number":18,"context_line":"Conflicts:"},{"line_number":19,"context_line":"    neutron/tests/functional/objects/test_quota.py"},{"line_number":20,"context_line":""},{"line_number":21,"context_line":"Change-Id: I9284a6830ea103cb51a775fff720973852076770"},{"line_number":22,"context_line":"(cherry picked from commit 60b08896ab596be272e83c97be80ad62a3e2cbe4)"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":2,"id":"270cf575_a09d0552","line":19,"in_reply_to":"3e69301e_49aef8b3","updated":"2021-03-31 08:13:43.000000000","message":"ok, thx","commit_id":"ecdf1752e8dd15beeceba61a804e4c6ff5049053"},{"author":{"_account_id":21798,"name":"Bernard Cafarelli","email":"bcafarel@redhat.com","username":"bcafarel"},"change_message_id":"962c98eb17f7dd81e8046c5f56b1ff0a56668313","unresolved":true,"context_lines":[{"line_number":16,"context_line":"Related-Bug: #1918565"},{"line_number":17,"context_line":""},{"line_number":18,"context_line":"Conflicts:"},{"line_number":19,"context_line":"    neutron/tests/functional/objects/test_quota.py"},{"line_number":20,"context_line":""},{"line_number":21,"context_line":"Change-Id: I9284a6830ea103cb51a775fff720973852076770"},{"line_number":22,"context_line":"(cherry picked from commit 60b08896ab596be272e83c97be80ad62a3e2cbe4)"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":2,"id":"3e69301e_49aef8b3","line":19,"in_reply_to":"59e93ad1_460894bb","updated":"2021-03-24 16:03:57.000000000","message":"Indeed, we already hit that super() py27 style issue in some backports","commit_id":"ecdf1752e8dd15beeceba61a804e4c6ff5049053"},{"author":{"_account_id":16688,"name":"Rodolfo Alonso","email":"ralonsoh@redhat.com","username":"rodolfo-alonso-hernandez"},"change_message_id":"f9218a43b51590c724644bae4d178e1c4bd2ae44","unresolved":true,"context_lines":[{"line_number":16,"context_line":"Related-Bug: #1918565"},{"line_number":17,"context_line":""},{"line_number":18,"context_line":"Conflicts:"},{"line_number":19,"context_line":"    neutron/tests/functional/objects/test_quota.py"},{"line_number":20,"context_line":""},{"line_number":21,"context_line":"Change-Id: I9284a6830ea103cb51a775fff720973852076770"},{"line_number":22,"context_line":"(cherry picked from commit 60b08896ab596be272e83c97be80ad62a3e2cbe4)"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":2,"id":"59e93ad1_460894bb","line":19,"in_reply_to":"9377dfb4_ac82f716","updated":"2021-03-24 13:59:33.000000000","message":"I changed [1] to be compatible with py27. If the patch is changed from the original one, I think I must add this \"conflicts\" section.\n\n[1]https://review.opendev.org/c/openstack/neutron/+/782418/2/neutron/tests/functional/objects/test_quota.py#28","commit_id":"ecdf1752e8dd15beeceba61a804e4c6ff5049053"}]}