)]}'
{"/COMMIT_MSG":[{"author":{"_account_id":9708,"name":"Balazs Gibizer","display_name":"gibi","email":"gibizer@gmail.com","username":"gibi"},"change_message_id":"52a53917323bba0de2801e7e7d87e89230d17e2b","unresolved":true,"context_lines":[{"line_number":10,"context_line":"a vm in the powering-off state"},{"line_number":11,"context_line":""},{"line_number":12,"context_line":"New changes:"},{"line_number":13,"context_line":"1 - Added GlanceFixture"},{"line_number":14,"context_line":""},{"line_number":15,"context_line":"Related-Bug: #1978983"},{"line_number":16,"context_line":"Change-Id: I5540df6c7497956219c06cff6f15b51c2c8bc299"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":2,"id":"d30a611a_b1d5698e","line":13,"updated":"2022-10-27 09:47:47.000000000","message":"This is sub-optimal as now some tests uses stub_out_image_service and some uses the GlanceFixture in ussuri.\n\nI suggest to either:\na) cherry-pick the whole patch that introduced GlanceFixture into this series: https://review.opendev.org/c/openstack/nova/+/745907\nOR\nb) re-write your current test to use the old stub_out_image_service way to mock out Glance.","commit_id":"8d4b63098afe51379650994b435a0b1bcbd5855c"},{"author":{"_account_id":34860,"name":"Amit Uniyal","email":"auniyal@redhat.com","username":"auniyal"},"change_message_id":"09c38c7d551e3d8d8c9f2c43005551f0663aefac","unresolved":true,"context_lines":[{"line_number":10,"context_line":"a vm in the powering-off state"},{"line_number":11,"context_line":""},{"line_number":12,"context_line":"New changes:"},{"line_number":13,"context_line":"1 - Added GlanceFixture"},{"line_number":14,"context_line":""},{"line_number":15,"context_line":"Related-Bug: #1978983"},{"line_number":16,"context_line":"Change-Id: I5540df6c7497956219c06cff6f15b51c2c8bc299"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":2,"id":"3a7a95b0_2b3e30d2","line":13,"in_reply_to":"d30a611a_b1d5698e","updated":"2022-10-31 11:54:56.000000000","message":"replaced GlanceFixture with fake.stub_out_image_service","commit_id":"8d4b63098afe51379650994b435a0b1bcbd5855c"},{"author":{"_account_id":4690,"name":"melanie witt","display_name":"melwitt","email":"melwittt@gmail.com","username":"melwitt"},"change_message_id":"1818fe6eb96a7c6c44b1110eea1c04dcb85b89c1","unresolved":true,"context_lines":[{"line_number":8,"context_line":""},{"line_number":9,"context_line":"This change add a repoducer test for evacuating"},{"line_number":10,"context_line":"a vm in the powering-off state"},{"line_number":11,"context_line":""},{"line_number":12,"context_line":"New changes:"},{"line_number":13,"context_line":"1 - using fake.stub_out_image_service instead of GlanceFixture"},{"line_number":14,"context_line":""}],"source_content_type":"text/x-gerrit-commit-message","patch_set":3,"id":"4d0b9cc1_436cb139","line":11,"updated":"2022-11-08 01:53:10.000000000","message":"There should have been a \"Conflicts:\" section here added by git during the cherry pick with a list of files in conflict. Please uncomment that in the commit message when backporting.\n\nThen, under the Conflicts section, it is ideal to show what caused the merge conflict(s) to give us some documentation of the reasoning behind how they were manually resolved.\n\nThis is an example (that is probably more complicated than what we have here, but you get the idea):\n\nhttps://review.opendev.org/c/openstack/nova/+/806629/6//COMMIT_MSG\n\nIn this patch, it would be like:\n\nConflicts:\n    nova/tests/functional/integrated_helpers.py\n    nova/tests/functional/test_servers.py \n\nNOTE(auniyal): Conflicts are due to the following changes that are not in Ussuri:\n\n  * I147bf4d95e6d86ff1f967a8ce37260730f21d236 (Cyborg evacuate support)\n  * Ia3d7351c1805d98bcb799ab0375673c7f1cb8848 (Functional tests for NUMA\n    live migration\n)\n\nYou can find what caused conflicts using git blame.","commit_id":"2397dffd6ece67ab75a1dda76f5db97df3d72c0f"},{"author":{"_account_id":34860,"name":"Amit Uniyal","email":"auniyal@redhat.com","username":"auniyal"},"change_message_id":"f7f65ec46bb038f1c90e6502e959812cf1e473ea","unresolved":false,"context_lines":[{"line_number":8,"context_line":""},{"line_number":9,"context_line":"This change add a repoducer test for evacuating"},{"line_number":10,"context_line":"a vm in the powering-off state"},{"line_number":11,"context_line":""},{"line_number":12,"context_line":"New changes:"},{"line_number":13,"context_line":"1 - using fake.stub_out_image_service instead of GlanceFixture"},{"line_number":14,"context_line":""}],"source_content_type":"text/x-gerrit-commit-message","patch_set":3,"id":"7bf4e898_2a52f0c6","line":11,"in_reply_to":"4d0b9cc1_436cb139","updated":"2022-11-09 07:05:08.000000000","message":"Thanks, updated commit msg.","commit_id":"2397dffd6ece67ab75a1dda76f5db97df3d72c0f"}],"/PATCHSET_LEVEL":[{"author":{"_account_id":4690,"name":"melanie witt","display_name":"melwitt","email":"melwittt@gmail.com","username":"melwitt"},"change_message_id":"1818fe6eb96a7c6c44b1110eea1c04dcb85b89c1","unresolved":false,"context_lines":[],"source_content_type":"","patch_set":3,"id":"61a7e95d_8fe937c0","updated":"2022-11-08 01:53:10.000000000","message":"When I cherry pick the stable/victoria change locally, there are some merge conflicts. We have a process for documenting merge conflict resolutions:\n\nhttps://docs.openstack.org/project-team-guide/stable-branches.html#conflicts\n\nPlease take a look and document conflicts in the commit message.\n","commit_id":"2397dffd6ece67ab75a1dda76f5db97df3d72c0f"},{"author":{"_account_id":9708,"name":"Balazs Gibizer","display_name":"gibi","email":"gibizer@gmail.com","username":"gibi"},"change_message_id":"b4fe66df9360f4b85415643009a0249f7b01f8bb","unresolved":false,"context_lines":[],"source_content_type":"","patch_set":5,"id":"f770c252_e42bd1f0","updated":"2022-11-17 13:07:20.000000000","message":"looks good","commit_id":"9015c3b663a7b46192c106ef065f93e82f0ab8be"}]}