)]}'
{"/COMMIT_MSG":[{"author":{"_account_id":15334,"name":"Stephen Finucane","display_name":"stephenfin","email":"stephenfin@redhat.com","username":"sfinucan"},"change_message_id":"7ccdec8b0e218542577177c980476268722b8185","unresolved":false,"context_lines":[{"line_number":18,"context_line":""},{"line_number":19,"context_line":"[1] https://specs.openstack.org/openstack/nova-specs/specs/train/implemented/amd-sev-libvirt-support.html#proposed-change"},{"line_number":20,"context_line":""},{"line_number":21,"context_line":"NOTE(lyarwood): Conflicts caused by I45f1df4935905170957c2ea2496c8a698a7464a2"},{"line_number":22,"context_line":"and I017083b27cd9d145eecb01106388d4ce880ba823 not being present on"},{"line_number":23,"context_line":"stable/victoria."},{"line_number":24,"context_line":""}],"source_content_type":"text/x-gerrit-commit-message","patch_set":1,"id":"1a08cb01_21e8a160","line":21,"updated":"2021-06-16 09:51:10.000000000","message":"(\"libvirt: add IP address to libvirt guest metadata\")","commit_id":"4985667efced966d0a47ac9f8d31d73ae7409b0a"},{"author":{"_account_id":15334,"name":"Stephen Finucane","display_name":"stephenfin","email":"stephenfin@redhat.com","username":"sfinucan"},"change_message_id":"7ccdec8b0e218542577177c980476268722b8185","unresolved":false,"context_lines":[{"line_number":19,"context_line":"[1] https://specs.openstack.org/openstack/nova-specs/specs/train/implemented/amd-sev-libvirt-support.html#proposed-change"},{"line_number":20,"context_line":""},{"line_number":21,"context_line":"NOTE(lyarwood): Conflicts caused by I45f1df4935905170957c2ea2496c8a698a7464a2"},{"line_number":22,"context_line":"and I017083b27cd9d145eecb01106388d4ce880ba823 not being present on"},{"line_number":23,"context_line":"stable/victoria."},{"line_number":24,"context_line":""},{"line_number":25,"context_line":"Conflicts:"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":1,"id":"12893d2e_08228ac7","line":22,"updated":"2021-06-16 09:51:10.000000000","message":"(\"libvirt: Bump MIN_{LIBVIRT,QEMU}_VERSION and NEXT_MIN_{LIBVIRT,QEMU}_VERSION\")","commit_id":"4985667efced966d0a47ac9f8d31d73ae7409b0a"},{"author":{"_account_id":15334,"name":"Stephen Finucane","display_name":"stephenfin","email":"stephenfin@redhat.com","username":"sfinucan"},"change_message_id":"7ccdec8b0e218542577177c980476268722b8185","unresolved":false,"context_lines":[{"line_number":20,"context_line":""},{"line_number":21,"context_line":"NOTE(lyarwood): Conflicts caused by I45f1df4935905170957c2ea2496c8a698a7464a2"},{"line_number":22,"context_line":"and I017083b27cd9d145eecb01106388d4ce880ba823 not being present on"},{"line_number":23,"context_line":"stable/victoria."},{"line_number":24,"context_line":""},{"line_number":25,"context_line":"Conflicts:"},{"line_number":26,"context_line":"  nova/tests/unit/virt/libvirt/test_driver.py"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":1,"id":"85ed0525_c5354316","line":23,"updated":"2021-06-16 09:51:10.000000000","message":"yeah, we don\u0027t want to backport either of these","commit_id":"4985667efced966d0a47ac9f8d31d73ae7409b0a"}],"nova/tests/unit/virt/libvirt/test_driver.py":[{"author":{"_account_id":15334,"name":"Stephen Finucane","display_name":"stephenfin","email":"stephenfin@redhat.com","username":"sfinucan"},"change_message_id":"7ccdec8b0e218542577177c980476268722b8185","unresolved":false,"context_lines":[{"line_number":23619,"context_line":"                       fakelibvirt.VIR_DOMAIN_AFFECT_LIVE))"},{"line_number":23620,"context_line":"            mock_detach_interface.assert_called_with(self.context, instance,"},{"line_number":23621,"context_line":"                                                     network_info[0])"},{"line_number":23622,"context_line":""},{"line_number":23623,"context_line":"    @mock.patch(\u0027nova.virt.libvirt.designer.set_driver_iommu_for_device\u0027)"},{"line_number":23624,"context_line":"    @mock.patch.object(libvirt_driver.LibvirtDriver, \u0027_sev_enabled\u0027)"},{"line_number":23625,"context_line":"    @mock.patch.object(objects.Instance, \u0027save\u0027)"}],"source_content_type":"text/x-python","patch_set":1,"id":"a2b0e66c_ec145e3e","line":23622,"updated":"2021-06-16 09:51:10.000000000","message":"The first of the conflicts is here because \u0027test_attach_interface_guest_set_metadata\u0027 doesn\u0027t exist yet","commit_id":"4985667efced966d0a47ac9f8d31d73ae7409b0a"}],"nova/virt/libvirt/driver.py":[{"author":{"_account_id":15334,"name":"Stephen Finucane","display_name":"stephenfin","email":"stephenfin@redhat.com","username":"sfinucan"},"change_message_id":"7ccdec8b0e218542577177c980476268722b8185","unresolved":false,"context_lines":[{"line_number":2059,"context_line":"        self._connect_volume(context, new_connection_info, instance)"},{"line_number":2060,"context_line":"        conf \u003d self._get_volume_config("},{"line_number":2061,"context_line":"            instance, new_connection_info, disk_info)"},{"line_number":2062,"context_line":"        if (not conf.source_path and not"},{"line_number":2063,"context_line":"            self._host.has_min_version(lv_ver\u003dMIN_LIBVIRT_BLOCKDEV,"},{"line_number":2064,"context_line":"                                       hv_ver\u003dMIN_QEMU_BLOCKDEV)):"},{"line_number":2065,"context_line":"            self._disconnect_volume(context, new_connection_info, instance)"}],"source_content_type":"text/x-python","patch_set":1,"id":"5ffab961_fa182e71","line":2062,"updated":"2021-06-16 09:51:10.000000000","message":"and the other conflict is here. This block has been removed on stable/wallaby and later since we bumped the versions","commit_id":"4985667efced966d0a47ac9f8d31d73ae7409b0a"}]}