)]}'
{"/COMMIT_MSG":[{"author":{"_account_id":4690,"name":"melanie witt","display_name":"melwitt","email":"melwittt@gmail.com","username":"melwitt"},"change_message_id":"b85c5b9a9cb8ec6397b57a84cbc51b0ae7a37a27","unresolved":false,"context_lines":[{"line_number":38,"context_line":"destination as is already provided to VIR_MIGRATE_PARAM_DEST_XML."},{"line_number":39,"context_line":""},{"line_number":40,"context_line":"Conflicts:"},{"line_number":41,"context_line":"    nova/tests/unit/virt/libvirt/test_driver.py"},{"line_number":42,"context_line":"    nova/virt/libvirt/driver.py"},{"line_number":43,"context_line":""},{"line_number":44,"context_line":"Co-authored-by: Tadayoshi Hosoya \u003ctad-hosoya@wr.jp.nec.com\u003e"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":3,"id":"9f560f44_453f1221","line":41,"updated":"2020-09-25 15:21:07.000000000","message":"Conflict is because the Pike backport of change I9b545ca8aa6dd7b41ddea2d333190c9fbed19bc1 explicitly asserts byte string destination_xml in _test_live_migration_block_migration_flags and the change is not in Queens where this is being backported from.","commit_id":"d30f28dbd28b825b1d5a4af48eb00b1f06fd97e9"},{"author":{"_account_id":4690,"name":"melanie witt","display_name":"melwitt","email":"melwittt@gmail.com","username":"melwitt"},"change_message_id":"b85c5b9a9cb8ec6397b57a84cbc51b0ae7a37a27","unresolved":false,"context_lines":[{"line_number":39,"context_line":""},{"line_number":40,"context_line":"Conflicts:"},{"line_number":41,"context_line":"    nova/tests/unit/virt/libvirt/test_driver.py"},{"line_number":42,"context_line":"    nova/virt/libvirt/driver.py"},{"line_number":43,"context_line":""},{"line_number":44,"context_line":"Co-authored-by: Tadayoshi Hosoya \u003ctad-hosoya@wr.jp.nec.com\u003e"},{"line_number":45,"context_line":"Closes-Bug: #1890501"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":3,"id":"9f560f44_e50aa6ce","line":42,"updated":"2020-09-25 15:21:07.000000000","message":"Conflicts here are because changes:\n\n  I6ac601e633ab2b0a67b4802ff880865255188a93 (libvirt: Provide VGPU inventory for a single GPU type)\n  I947bf0ad34a48e9182a3dc016f47f0c9f71c9d7b ([libvirt] Allow multiple volume attachments)\n  Ibfa64f18bbd2fb70db7791330ed1a64fe61c1355 (libvirt: QEMU native LUKS decryption for encrypted volumes)\n  If2035cac931c42c440d61ba97ebc7e9e92141a28 (libvirt: Rework \u0027EBUSY\u0027 (SIGKILL) error handling code path)\n  Ibf210dd27972fed2651d6c9bd73a0bcf352c8bab (libvirt: create vGPU for instance)\n\nare not in Pike.","commit_id":"d30f28dbd28b825b1d5a4af48eb00b1f06fd97e9"}],"nova/tests/unit/virt/libvirt/test_driver.py":[{"author":{"_account_id":17685,"name":"Elod Illes","email":"elod.illes@est.tech","username":"elod.illes"},"change_message_id":"b94bc73a769adfcf1309d76553cb80caf52bd452","unresolved":false,"context_lines":[{"line_number":9197,"context_line":"        params \u003d {"},{"line_number":9198,"context_line":"            \u0027migrate_disks\u0027: device_names,"},{"line_number":9199,"context_line":"            \u0027bandwidth\u0027: CONF.libvirt.live_migration_bandwidth,"},{"line_number":9200,"context_line":"            \u0027destination_xml\u0027: b\u0027\u003cxml/\u003e\u0027,"},{"line_number":9201,"context_line":"            \u0027persistent_xml\u0027: b\u0027\u003cxml/\u003e\u0027,"},{"line_number":9202,"context_line":"        }"},{"line_number":9203,"context_line":"        mock_migrateToURI3.assert_called_once_with("}],"source_content_type":"text/x-python","patch_set":2,"id":"9f560f44_e0da9448","line":9200,"range":{"start_line":9200,"start_character":31,"end_line":9200,"end_character":32},"updated":"2020-08-26 16:27:41.000000000","message":"this causes the conflict, which is due to patch I85cd9a903fba310b5ae7bedeed118ca4ea98dff6 is not present in pike.","commit_id":"6a2fb8338551f17ab962f5e88a0d5b7be17ce637"}],"nova/virt/libvirt/driver.py":[{"author":{"_account_id":17685,"name":"Elod Illes","email":"elod.illes@est.tech","username":"elod.illes"},"change_message_id":"b94bc73a769adfcf1309d76553cb80caf52bd452","unresolved":false,"context_lines":[{"line_number":301,"context_line":"                                \u0027mbml\u0027: \u0027mbm_local\u0027,"},{"line_number":302,"context_line":"                                \u0027mbmt\u0027: \u0027mbm_total\u0027,"},{"line_number":303,"context_line":"                               }"},{"line_number":304,"context_line":""},{"line_number":305,"context_line":"# libvirt \u003e\u003d v1.3.4 introduced VIR_MIGRATE_PARAM_PERSIST_XML that needs to be"},{"line_number":306,"context_line":"# provided when the VIR_MIGRATE_PERSIST_DEST flag is used to ensure the updated"},{"line_number":307,"context_line":"# domain XML is persisted on the destination."}],"source_content_type":"text/x-python","patch_set":2,"id":"9f560f44_c0b670f9","line":304,"updated":"2020-08-26 16:27:41.000000000","message":"Conflict is due to several constants are missing from here, which were introduced with multiple features in Queens.","commit_id":"6a2fb8338551f17ab962f5e88a0d5b7be17ce637"}]}