)]}'
{"/COMMIT_MSG":[{"author":{"_account_id":15334,"name":"Stephen Finucane","display_name":"stephenfin","email":"stephenfin@redhat.com","username":"sfinucan"},"change_message_id":"65cf98cdef74e87fc16d05faf1768275e0add87f","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 I5c346e690148678a2f0dc63f4f516a944c3db8cd,"},{"line_number":22,"context_line":"I8e8035dcf508f5215bba9b7575c5c6abfe41da31 and"},{"line_number":23,"context_line":"I3448b89f58f3c3a85d15ee5a870c24b4b7f201df not being present in"},{"line_number":24,"context_line":"stable/train."}],"source_content_type":"text/x-gerrit-commit-message","patch_set":1,"id":"5d0e3522_5e9da677","line":21,"updated":"2021-06-16 16:22:19.000000000","message":"(\"Support live migration with vpmem\")","commit_id":"9587cad6a1d58045394c4e669a0949baf016d7ac"},{"author":{"_account_id":15334,"name":"Stephen Finucane","display_name":"stephenfin","email":"stephenfin@redhat.com","username":"sfinucan"},"change_message_id":"a42650197bf29e58e7279b054eb1679ce210992f","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 I5c346e690148678a2f0dc63f4f516a944c3db8cd,"},{"line_number":22,"context_line":"I8e8035dcf508f5215bba9b7575c5c6abfe41da31 and"},{"line_number":23,"context_line":"I3448b89f58f3c3a85d15ee5a870c24b4b7f201df not being present in"},{"line_number":24,"context_line":"stable/train."},{"line_number":25,"context_line":""}],"source_content_type":"text/x-gerrit-commit-message","patch_set":1,"id":"a743fef6_b7ab5a40","line":22,"updated":"2021-06-16 16:23:32.000000000","message":"(\"libvirt: Use virDomainBlockCopy to swap volumes when using -blockdev\")","commit_id":"9587cad6a1d58045394c4e669a0949baf016d7ac"},{"author":{"_account_id":15334,"name":"Stephen Finucane","display_name":"stephenfin","email":"stephenfin@redhat.com","username":"sfinucan"},"change_message_id":"a42650197bf29e58e7279b054eb1679ce210992f","unresolved":false,"context_lines":[{"line_number":20,"context_line":""},{"line_number":21,"context_line":"NOTE(lyarwood): Conflicts caused by I5c346e690148678a2f0dc63f4f516a944c3db8cd,"},{"line_number":22,"context_line":"I8e8035dcf508f5215bba9b7575c5c6abfe41da31 and"},{"line_number":23,"context_line":"I3448b89f58f3c3a85d15ee5a870c24b4b7f201df not being present in"},{"line_number":24,"context_line":"stable/train."},{"line_number":25,"context_line":""},{"line_number":26,"context_line":"Conflicts:"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":1,"id":"0fd34566_916bdfe1","line":23,"updated":"2021-06-16 16:23:32.000000000","message":"(\"libvirt: Check the guest support UEFI\")","commit_id":"9587cad6a1d58045394c4e669a0949baf016d7ac"}],"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":"65cf98cdef74e87fc16d05faf1768275e0add87f","unresolved":false,"context_lines":[{"line_number":11125,"context_line":"                guest,"},{"line_number":11126,"context_line":"                migrate_data,"},{"line_number":11127,"context_line":"                mock.ANY,"},{"line_number":11128,"context_line":"                get_vif_config\u003dNone,"},{"line_number":11129,"context_line":"        )"},{"line_number":11130,"context_line":""},{"line_number":11131,"context_line":"    def test_live_migration_update_vifs_xml(self):"}],"source_content_type":"text/x-python","patch_set":1,"id":"4dba5e12_222d2b74","line":11128,"updated":"2021-06-16 16:22:19.000000000","message":"there\u0027s a new_resources\u003dNone argument on stable/ussuri that isn\u0027t here due to [1]\n\n[1] I5c346e690148678a2f0dc63f4f516a944c3db8cd","commit_id":"9587cad6a1d58045394c4e669a0949baf016d7ac"},{"author":{"_account_id":15334,"name":"Stephen Finucane","display_name":"stephenfin","email":"stephenfin@redhat.com","username":"sfinucan"},"change_message_id":"65cf98cdef74e87fc16d05faf1768275e0add87f","unresolved":false,"context_lines":[{"line_number":11157,"context_line":"            guest,"},{"line_number":11158,"context_line":"            migrate_data,"},{"line_number":11159,"context_line":"            get_volume_config,"},{"line_number":11160,"context_line":"            get_vif_config\u003dNone,"},{"line_number":11161,"context_line":"        ):"},{"line_number":11162,"context_line":"            self.assertIsNotNone(get_vif_config)"},{"line_number":11163,"context_line":"            return fake_xml"}],"source_content_type":"text/x-python","patch_set":1,"id":"b8df150c_b905b8c2","line":11160,"updated":"2021-06-16 16:22:19.000000000","message":"ditto","commit_id":"9587cad6a1d58045394c4e669a0949baf016d7ac"}],"nova/virt/libvirt/driver.py":[{"author":{"_account_id":15334,"name":"Stephen Finucane","display_name":"stephenfin","email":"stephenfin@redhat.com","username":"sfinucan"},"change_message_id":"65cf98cdef74e87fc16d05faf1768275e0add87f","unresolved":false,"context_lines":[{"line_number":2006,"context_line":"        self._connect_volume(context, new_connection_info, instance)"},{"line_number":2007,"context_line":"        conf \u003d self._get_volume_config("},{"line_number":2008,"context_line":"            instance, new_connection_info, disk_info)"},{"line_number":2009,"context_line":"        if not conf.source_path:"},{"line_number":2010,"context_line":"            self._disconnect_volume(context, new_connection_info, instance)"},{"line_number":2011,"context_line":"            raise NotImplementedError(_(\"Swap only supports host devices\"))"},{"line_number":2012,"context_line":""}],"source_content_type":"text/x-python","patch_set":1,"id":"934a3a05_49b10212","line":2009,"updated":"2021-06-16 16:22:19.000000000","message":"another conflict here because we\u0027re missing [1]\n\n[1] I8e8035dcf508f5215bba9b7575c5c6abfe41da31","commit_id":"9587cad6a1d58045394c4e669a0949baf016d7ac"},{"author":{"_account_id":15334,"name":"Stephen Finucane","display_name":"stephenfin","email":"stephenfin@redhat.com","username":"sfinucan"},"change_message_id":"65cf98cdef74e87fc16d05faf1768275e0add87f","unresolved":false,"context_lines":[{"line_number":8711,"context_line":"                    # the method _get_volume_config and we should to find"},{"line_number":8712,"context_line":"                    # a way to avoid this in future."},{"line_number":8713,"context_line":"                    instance, guest, migrate_data, self._get_volume_config,"},{"line_number":8714,"context_line":"                    get_vif_config\u003dget_vif_config)"},{"line_number":8715,"context_line":""},{"line_number":8716,"context_line":"            # NOTE(pkoniszewski): Because of precheck which blocks"},{"line_number":8717,"context_line":"            # tunnelled block live migration with mapped volumes we"}],"source_content_type":"text/x-python","patch_set":1,"id":"286abc43_3438848b","line":8714,"updated":"2021-06-16 16:22:19.000000000","message":"another conflict due to a missing new_resources kwarg","commit_id":"9587cad6a1d58045394c4e669a0949baf016d7ac"}]}
