)]}'
{"/COMMIT_MSG":[{"author":{"_account_id":17685,"name":"Elod Illes","email":"elod.illes@est.tech","username":"elod.illes"},"change_message_id":"3f6e26e927fdbc4326cfb2d5aa84ad2d6f273536","unresolved":false,"context_lines":[{"line_number":32,"context_line":"      nova/virt/libvirt/driver.py"},{"line_number":33,"context_line":""},{"line_number":34,"context_line":"Both conflict is due to I2489bf16dabc8a83b2044139247f4245ae29adb1 not in"},{"line_number":35,"context_line":"stable/ussuri"},{"line_number":36,"context_line":""},{"line_number":37,"context_line":"Change-Id: Ie904d1513b5cf76d6d5f6877545e8eb378dd5499"},{"line_number":38,"context_line":"Closes-Bug: #1946729"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":1,"id":"ed82d4f1_9c3f452f","line":35,"updated":"2022-08-02 14:27:16.000000000","message":"(and somewhat this patch also: https://review.opendev.org/c/openstack/nova/+/631363\nthough, the main patch that causes the conflict is the one you mention)","commit_id":"35e071470e2c5597444a7b85211a01e7fbc7c68b"}],"/PATCHSET_LEVEL":[{"author":{"_account_id":17685,"name":"Elod Illes","email":"elod.illes@est.tech","username":"elod.illes"},"change_message_id":"3f6e26e927fdbc4326cfb2d5aa84ad2d6f273536","unresolved":false,"context_lines":[],"source_content_type":"","patch_set":1,"id":"f33af667_66cb6f7a","updated":"2022-08-02 14:27:16.000000000","message":"In general, the patch is OK: merged in victoria, conflict is noted and code-wise it is resolved correctly, only a nitty-nit issue with an unnecessarily deleted comment (see inline).","commit_id":"35e071470e2c5597444a7b85211a01e7fbc7c68b"}],"nova/virt/libvirt/driver.py":[{"author":{"_account_id":17685,"name":"Elod Illes","email":"elod.illes@est.tech","username":"elod.illes"},"change_message_id":"3f6e26e927fdbc4326cfb2d5aa84ad2d6f273536","unresolved":true,"context_lines":[{"line_number":3316,"context_line":""},{"line_number":3317,"context_line":"        # Initialize all the necessary networking, block devices and"},{"line_number":3318,"context_line":"        # start the instance."},{"line_number":3319,"context_line":"        # NOTE(melwitt): Pass vifs_already_plugged\u003dTrue here even though we\u0027ve"},{"line_number":3320,"context_line":"        # unplugged vifs earlier. The behavior of neutron plug events depends"},{"line_number":3321,"context_line":"        # on which vif type we\u0027re using and we are working with a stale network"},{"line_number":3322,"context_line":"        # info cache here, so won\u0027t rely on waiting for neutron plug events."},{"line_number":3323,"context_line":"        # vifs_already_plugged\u003dTrue means \"do not wait for neutron plug events\""},{"line_number":3324,"context_line":"        self._create_domain_and_network(context, xml, instance, network_info,"},{"line_number":3325,"context_line":"                                        block_device_info\u003dblock_device_info,"},{"line_number":3326,"context_line":"                                        vifs_already_plugged\u003dTrue)"}],"source_content_type":"text/x-python","patch_set":1,"id":"624d6eae_923f46bb","side":"PARENT","line":3323,"range":{"start_line":3319,"start_character":0,"end_line":3323,"end_character":79},"updated":"2022-08-02 14:27:16.000000000","message":"nit: this comment should not be deleted and the new block which initializes the external_events should be after this comment (as it was under the this comment in the original patch).","commit_id":"6667fcb92bfaf03a8a274dc26806c137aace6b49"}]}