)]}'
{"/COMMIT_MSG":[{"author":{"_account_id":21798,"name":"Bernard Cafarelli","email":"bcafarel@redhat.com","username":"bcafarel"},"change_message_id":"65bf8f4e8280e6b5db33fc71d0f66d85e35accac","unresolved":false,"context_lines":[{"line_number":22,"context_line":"intermediate query is done to retrieve the SG rule IDs. Those IDs"},{"line_number":23,"context_line":"will be used as a filter in the \"get_objects\" call."},{"line_number":24,"context_line":""},{"line_number":25,"context_line":"Conflicts:"},{"line_number":26,"context_line":"      neutron/objects/securitygroup.py"},{"line_number":27,"context_line":""},{"line_number":28,"context_line":"Closes-Bug: #1863201"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":1,"id":"3f4c43b2_48a51e04","line":25,"range":{"start_line":25,"start_character":0,"end_line":25,"end_character":10},"updated":"2020-04-15 09:03:42.000000000","message":"Looks like it conflicted in neutron/db/securitygroups_db.py too? (probably as it did on train)","commit_id":"61dc621c1ba40efcedabdfb9f3a1854cea227d2c"},{"author":{"_account_id":16688,"name":"Rodolfo Alonso","email":"ralonsoh@redhat.com","username":"rodolfo-alonso-hernandez"},"change_message_id":"6bbb52f78e76d0d5197d13f3922b838f21365c75","unresolved":false,"context_lines":[{"line_number":22,"context_line":"intermediate query is done to retrieve the SG rule IDs. Those IDs"},{"line_number":23,"context_line":"will be used as a filter in the \"get_objects\" call."},{"line_number":24,"context_line":""},{"line_number":25,"context_line":"Conflicts:"},{"line_number":26,"context_line":"      neutron/objects/securitygroup.py"},{"line_number":27,"context_line":""},{"line_number":28,"context_line":"Closes-Bug: #1863201"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":1,"id":"3f4c43b2_c3b2a8e6","line":25,"range":{"start_line":25,"start_character":0,"end_line":25,"end_character":10},"in_reply_to":"3f4c43b2_48a51e04","updated":"2020-04-15 16:13:27.000000000","message":"I cherry-picked the Train patch into Stein and I only had this conflict.","commit_id":"61dc621c1ba40efcedabdfb9f3a1854cea227d2c"}]}