)]}'
{"/COMMIT_MSG":[{"author":{"_account_id":7730,"name":"Sahid Orentino Ferdjaoui","email":"sahid.ferdjaoui@industrialdiscipline.com","username":"sahid"},"change_message_id":"f5e150e2e55e0c8d874dc1d70b149cd9da79d9a5","unresolved":false,"context_lines":[{"line_number":13,"context_line":"Partial-Bug: #1313573"},{"line_number":14,"context_line":""},{"line_number":15,"context_line":"Conflicts:"},{"line_number":16,"context_line":"        nova/api/openstack/compute/contrib/admin_actions.py"},{"line_number":17,"context_line":"        nova/api/openstack/compute/plugins/v3/create_backup.py"},{"line_number":18,"context_line":""},{"line_number":19,"context_line":"Change-Id: Ic84fa9e0b9c2d7b6cf49955aa4f0d44ade2b5397"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":1,"id":"da9b358b_c355e61d","line":16,"updated":"2015-03-30 11:41:04.000000000","message":"Good practice to set notes about the conflicts","commit_id":"b7fb0e2346c13171b3e3055a060d2ab54b10544f"},{"author":{"_account_id":7730,"name":"Sahid Orentino Ferdjaoui","email":"sahid.ferdjaoui@industrialdiscipline.com","username":"sahid"},"change_message_id":"901aaa854e90ea7bee1895516a448af889d562ca","unresolved":false,"context_lines":[{"line_number":12,"context_line":""},{"line_number":13,"context_line":"Partial-Bug: #1313573"},{"line_number":14,"context_line":""},{"line_number":15,"context_line":"NOTE: This conflict is caused by this line https://github.com/openstack/nova/blob/master/nova/api/openstack/compute/contrib/admin_actions.py#L291"},{"line_number":16,"context_line":""},{"line_number":17,"context_line":"Conflicts:"},{"line_number":18,"context_line":"        nova/api/openstack/compute/contrib/admin_actions.py"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":2,"id":"da9b358b_ab537538","line":15,"updated":"2015-04-01 13:23:48.000000000","message":"Probably not a good thing to set a link in the commit message. A note with some line about what did you update to fix the conflict is probably enough","commit_id":"80c54dd1b71e0423fa6d4cbb06756f7bf0c731a9"}],"nova/api/openstack/compute/contrib/admin_actions.py":[{"author":{"_account_id":7730,"name":"Sahid Orentino Ferdjaoui","email":"sahid.ferdjaoui@industrialdiscipline.com","username":"sahid"},"change_message_id":"f5e150e2e55e0c8d874dc1d70b149cd9da79d9a5","unresolved":false,"context_lines":[{"line_number":299,"context_line":"        except exception.InstanceInvalidState as state_error:"},{"line_number":300,"context_line":"            common.raise_http_conflict_for_instance_invalid_state(state_error,"},{"line_number":301,"context_line":"                    \u0027createBackup\u0027)"},{"line_number":302,"context_line":"        except exception.InvalidRequest as e:"},{"line_number":303,"context_line":"            raise exc.HTTPBadRequest(explanation\u003de.format_message())"},{"line_number":304,"context_line":""},{"line_number":305,"context_line":"        resp \u003d webob.Response(status_int\u003d202)"}],"source_content_type":"text/x-python","patch_set":1,"id":"da9b358b_e61d9867","line":302,"updated":"2015-03-30 11:41:04.000000000","message":"So the conflict probably does not come from here. it is difficult to imagine where is happen. can you update the commit message?","commit_id":"b7fb0e2346c13171b3e3055a060d2ab54b10544f"}]}