)]}'
{"/COMMIT_MSG":[{"author":{"_account_id":4690,"name":"melanie witt","display_name":"melwitt","email":"melwittt@gmail.com","username":"melwitt"},"change_message_id":"f6a7af815796c9f252b7e98e85c84cdc60586b85","unresolved":false,"context_lines":[{"line_number":37,"context_line":"VIR_MIGRATE_PARAM_PERSIST_XML param using the same updated XML for the"},{"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":"    nova/virt/libvirt/guest.py"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":1,"id":"9f560f44_7225dec1","line":40,"updated":"2020-09-09 22:08:15.000000000","message":"Shouldn\u0027t nova/tests/unit/virt/test_virt_drivers.py also be listed here as a conflict because I3af68f745ffb23ef2b5407ccec0bebf4b2645734 isn\u0027t in queens? (tried this locally to work through the conflict sources)","commit_id":"a100c517ae4224a41d69346cace7a41cace7c165"},{"author":{"_account_id":10135,"name":"Lee Yarwood","display_name":"Lee Yarwood","email":"lyarwood@redhat.com","username":"lyarwood"},"change_message_id":"58a3311ccb60f0ca57de24237b67247d78fbc704","unresolved":false,"context_lines":[{"line_number":37,"context_line":"VIR_MIGRATE_PARAM_PERSIST_XML param using the same updated XML for the"},{"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":"    nova/virt/libvirt/guest.py"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":1,"id":"9f560f44_a2af1be1","line":40,"in_reply_to":"9f560f44_7225dec1","updated":"2020-09-10 12:04:29.000000000","message":"I\u0027ll list it but we essentially remove the conflict by dropping the use of the persistent_xml_param kwarg in guest.migrate.","commit_id":"a100c517ae4224a41d69346cace7a41cace7c165"},{"author":{"_account_id":4690,"name":"melanie witt","display_name":"melwitt","email":"melwittt@gmail.com","username":"melwitt"},"change_message_id":"013c34e0209d79ec115636b8a8e952e6b9b5e97b","unresolved":false,"context_lines":[{"line_number":37,"context_line":"VIR_MIGRATE_PARAM_PERSIST_XML param using the same updated XML for the"},{"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":"    nova/virt/libvirt/guest.py"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":1,"id":"9f560f44_fed07eca","line":40,"in_reply_to":"9f560f44_a2af1be1","updated":"2020-09-10 23:30:07.000000000","message":"Guh, you\u0027re right, I\u0027m sorry. Brain lapse on my part.","commit_id":"a100c517ae4224a41d69346cace7a41cace7c165"},{"author":{"_account_id":4690,"name":"melanie witt","display_name":"melwitt","email":"melwittt@gmail.com","username":"melwitt"},"change_message_id":"f6a7af815796c9f252b7e98e85c84cdc60586b85","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":"    nova/virt/libvirt/guest.py"},{"line_number":44,"context_line":""}],"source_content_type":"text/x-gerrit-commit-message","patch_set":1,"id":"9f560f44_55c1a47f","line":41,"updated":"2020-09-09 22:08:15.000000000","message":"Note to self: lots of conflicts here because of change \t\nIf0a091a7441f2c3269148e40ececc3696d69684c not in queens.","commit_id":"a100c517ae4224a41d69346cace7a41cace7c165"},{"author":{"_account_id":10135,"name":"Lee Yarwood","display_name":"Lee Yarwood","email":"lyarwood@redhat.com","username":"lyarwood"},"change_message_id":"58a3311ccb60f0ca57de24237b67247d78fbc704","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":"    nova/virt/libvirt/guest.py"},{"line_number":44,"context_line":""}],"source_content_type":"text/x-gerrit-commit-message","patch_set":1,"id":"9f560f44_627b437a","line":41,"in_reply_to":"9f560f44_55c1a47f","updated":"2020-09-10 12:04:29.000000000","message":"Yeah, for some reason I included the commit SHA below instead of the change id, I\u0027ll replace it now.","commit_id":"a100c517ae4224a41d69346cace7a41cace7c165"},{"author":{"_account_id":4690,"name":"melanie witt","display_name":"melwitt","email":"melwittt@gmail.com","username":"melwitt"},"change_message_id":"f6a7af815796c9f252b7e98e85c84cdc60586b85","unresolved":false,"context_lines":[{"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":"    nova/virt/libvirt/guest.py"},{"line_number":44,"context_line":""},{"line_number":45,"context_line":"NOTE(lyarwood): Conflicts as 403320bc9991618b09ab55c5f650916f5c46dd75"},{"line_number":46,"context_line":"(libvirt: Bump MIN_{LIBVIRT,QEMU}_VERSION for \"Rocky\") and"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":1,"id":"9f560f44_92a35243","line":43,"updated":"2020-09-09 22:08:15.000000000","message":"Note to self: no change is needed in this file bc the old API was just \"params\" and the new param has to be passed within that.\n\n(new API came in Id9ee1feeadf612fa79c3d280cee3a614a74a00a7 not in queens)","commit_id":"a100c517ae4224a41d69346cace7a41cace7c165"},{"author":{"_account_id":10135,"name":"Lee Yarwood","display_name":"Lee Yarwood","email":"lyarwood@redhat.com","username":"lyarwood"},"change_message_id":"58a3311ccb60f0ca57de24237b67247d78fbc704","unresolved":false,"context_lines":[{"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":"    nova/virt/libvirt/guest.py"},{"line_number":44,"context_line":""},{"line_number":45,"context_line":"NOTE(lyarwood): Conflicts as 403320bc9991618b09ab55c5f650916f5c46dd75"},{"line_number":46,"context_line":"(libvirt: Bump MIN_{LIBVIRT,QEMU}_VERSION for \"Rocky\") and"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":1,"id":"9f560f44_427eff69","line":43,"in_reply_to":"9f560f44_92a35243","updated":"2020-09-10 12:04:29.000000000","message":"As above, I\u0027ll switch to change ids below.","commit_id":"a100c517ae4224a41d69346cace7a41cace7c165"},{"author":{"_account_id":17685,"name":"Elod Illes","email":"elod.illes@est.tech","username":"elod.illes"},"change_message_id":"296c7b79d13b8dde4197e2a6fcd913997c80391d","unresolved":false,"context_lines":[{"line_number":47,"context_line":"4b3e877210dd1fa9f7bcee0ad655e72de87c9439 (libvirt: Remove usage of"},{"line_number":48,"context_line":"migrateToURI{2} APIs) are not present on stable/queens. As a result we"},{"line_number":49,"context_line":"can now add the parameter directly in _live_migration_operation before"},{"line_number":50,"context_line":"calling down into guest.migrate."},{"line_number":51,"context_line":""},{"line_number":52,"context_line":"Co-authored-by: Tadayoshi Hosoya \u003ctad-hosoya@wr.jp.nec.com\u003e"},{"line_number":53,"context_line":"Closes-Bug: #1890501"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":3,"id":"9f560f44_6ab79522","line":50,"updated":"2020-09-10 15:22:41.000000000","message":"Lee, did you reset the Note accidentally to be the same as in PS1 or was there a problem with the PS2 one?","commit_id":"a0a1a640cd4373376342a28e013e8b064d55128d"},{"author":{"_account_id":10135,"name":"Lee Yarwood","display_name":"Lee Yarwood","email":"lyarwood@redhat.com","username":"lyarwood"},"change_message_id":"561ca8907df5d194f8bfd182bce39a64e88085ee","unresolved":false,"context_lines":[{"line_number":47,"context_line":"4b3e877210dd1fa9f7bcee0ad655e72de87c9439 (libvirt: Remove usage of"},{"line_number":48,"context_line":"migrateToURI{2} APIs) are not present on stable/queens. As a result we"},{"line_number":49,"context_line":"can now add the parameter directly in _live_migration_operation before"},{"line_number":50,"context_line":"calling down into guest.migrate."},{"line_number":51,"context_line":""},{"line_number":52,"context_line":"Co-authored-by: Tadayoshi Hosoya \u003ctad-hosoya@wr.jp.nec.com\u003e"},{"line_number":53,"context_line":"Closes-Bug: #1890501"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":3,"id":"9f560f44_7fd58342","line":50,"in_reply_to":"9f560f44_6ab79522","updated":"2020-09-11 10:00:17.000000000","message":"Gah! Apologies I\u0027ll sort this out now","commit_id":"a0a1a640cd4373376342a28e013e8b064d55128d"}],"nova/virt/libvirt/driver.py":[{"author":{"_account_id":4690,"name":"melanie witt","display_name":"melwitt","email":"melwittt@gmail.com","username":"melwitt"},"change_message_id":"f6a7af815796c9f252b7e98e85c84cdc60586b85","unresolved":false,"context_lines":[{"line_number":7147,"context_line":"                if self._host.has_min_version("},{"line_number":7148,"context_line":"                    MIN_LIBVIRT_MIGRATE_PARAM_PERSIST_XML"},{"line_number":7149,"context_line":"                ):"},{"line_number":7150,"context_line":"                    params[\u0027persistent_xml\u0027] \u003d new_xml_str"},{"line_number":7151,"context_line":""},{"line_number":7152,"context_line":"            # TODO(sahid): This should be in"},{"line_number":7153,"context_line":"            # post_live_migration_at_source but no way to retrieve"}],"source_content_type":"text/x-python","patch_set":1,"id":"9f560f44_d5ec942a","line":7150,"updated":"2020-09-09 22:08:15.000000000","message":"Guh, this looked like an indention error at first glance because of the paren format.","commit_id":"a100c517ae4224a41d69346cace7a41cace7c165"},{"author":{"_account_id":10135,"name":"Lee Yarwood","display_name":"Lee Yarwood","email":"lyarwood@redhat.com","username":"lyarwood"},"change_message_id":"58a3311ccb60f0ca57de24237b67247d78fbc704","unresolved":false,"context_lines":[{"line_number":7147,"context_line":"                if self._host.has_min_version("},{"line_number":7148,"context_line":"                    MIN_LIBVIRT_MIGRATE_PARAM_PERSIST_XML"},{"line_number":7149,"context_line":"                ):"},{"line_number":7150,"context_line":"                    params[\u0027persistent_xml\u0027] \u003d new_xml_str"},{"line_number":7151,"context_line":""},{"line_number":7152,"context_line":"            # TODO(sahid): This should be in"},{"line_number":7153,"context_line":"            # post_live_migration_at_source but no way to retrieve"}],"source_content_type":"text/x-python","patch_set":1,"id":"9f560f44_c247afa2","line":7150,"in_reply_to":"9f560f44_d5ec942a","updated":"2020-09-10 12:04:29.000000000","message":"ACK I\u0027ll fix this now.","commit_id":"a100c517ae4224a41d69346cace7a41cace7c165"},{"author":{"_account_id":10135,"name":"Lee Yarwood","display_name":"Lee Yarwood","email":"lyarwood@redhat.com","username":"lyarwood"},"change_message_id":"b2b0c98e0143a7bb386f82b906fa1c07c2988c8b","unresolved":false,"context_lines":[{"line_number":7143,"context_line":"                    libvirt.VIR_MIGRATE_TUNNELLED !\u003d 0):"},{"line_number":7144,"context_line":"                    params.pop(\u0027migrate_disks\u0027)"},{"line_number":7145,"context_line":""},{"line_number":7146,"context_line":"                # NOTE(lyarwood): Only available from v1.3.4"},{"line_number":7147,"context_line":"                if self._host.has_min_version("},{"line_number":7148,"context_line":"                        MIN_LIBVIRT_MIGRATE_PARAM_PERSIST_XML):"},{"line_number":7149,"context_line":"                    params[\u0027persistent_xml\u0027] \u003d new_xml_str"},{"line_number":7150,"context_line":""},{"line_number":7151,"context_line":"            # TODO(sahid): This should be in"},{"line_number":7152,"context_line":"            # post_live_migration_at_source but no way to retrieve"}],"source_content_type":"text/x-python","patch_set":3,"id":"9f560f44_224dcb99","line":7149,"range":{"start_line":7146,"start_character":0,"end_line":7149,"end_character":58},"updated":"2020-09-10 12:12:32.000000000","message":"This will mean the change that lands in stable/queens will conflict with the earlier version of the patch attached to the launchpad and possibly already consumed by vendors btw.\n\nIt\u0027s trivial to resolve but worth noting I guess.","commit_id":"a0a1a640cd4373376342a28e013e8b064d55128d"},{"author":{"_account_id":4690,"name":"melanie witt","display_name":"melwitt","email":"melwittt@gmail.com","username":"melwitt"},"change_message_id":"50623a3ed44e697d93d30bcca9a88d5667f8962a","unresolved":false,"context_lines":[{"line_number":7143,"context_line":"                    libvirt.VIR_MIGRATE_TUNNELLED !\u003d 0):"},{"line_number":7144,"context_line":"                    params.pop(\u0027migrate_disks\u0027)"},{"line_number":7145,"context_line":""},{"line_number":7146,"context_line":"                # NOTE(lyarwood): Only available from v1.3.4"},{"line_number":7147,"context_line":"                if self._host.has_min_version("},{"line_number":7148,"context_line":"                        MIN_LIBVIRT_MIGRATE_PARAM_PERSIST_XML):"},{"line_number":7149,"context_line":"                    params[\u0027persistent_xml\u0027] \u003d new_xml_str"},{"line_number":7150,"context_line":""},{"line_number":7151,"context_line":"            # TODO(sahid): This should be in"},{"line_number":7152,"context_line":"            # post_live_migration_at_source but no way to retrieve"}],"source_content_type":"text/x-python","patch_set":3,"id":"9f560f44_5eafeae1","line":7149,"range":{"start_line":7146,"start_character":0,"end_line":7149,"end_character":58},"in_reply_to":"9f560f44_224dcb99","updated":"2020-09-10 22:32:41.000000000","message":"I didn\u0027t mean for you to change this, my apologies. Was only an empty complaint. I think it would be better to leave it so it is consistent with the other patches.","commit_id":"a0a1a640cd4373376342a28e013e8b064d55128d"},{"author":{"_account_id":4690,"name":"melanie witt","display_name":"melwitt","email":"melwittt@gmail.com","username":"melwitt"},"change_message_id":"79a7c5e57d715f170bde9e10e36755183eafabec","unresolved":false,"context_lines":[{"line_number":7143,"context_line":"                    libvirt.VIR_MIGRATE_TUNNELLED !\u003d 0):"},{"line_number":7144,"context_line":"                    params.pop(\u0027migrate_disks\u0027)"},{"line_number":7145,"context_line":""},{"line_number":7146,"context_line":"                # NOTE(lyarwood): Only available from v1.3.4"},{"line_number":7147,"context_line":"                if self._host.has_min_version("},{"line_number":7148,"context_line":"                        MIN_LIBVIRT_MIGRATE_PARAM_PERSIST_XML):"},{"line_number":7149,"context_line":"                    params[\u0027persistent_xml\u0027] \u003d new_xml_str"},{"line_number":7150,"context_line":""},{"line_number":7151,"context_line":"            # TODO(sahid): This should be in"},{"line_number":7152,"context_line":"            # post_live_migration_at_source but no way to retrieve"}],"source_content_type":"text/x-python","patch_set":3,"id":"9f560f44_be872661","line":7149,"range":{"start_line":7146,"start_character":0,"end_line":7149,"end_character":58},"in_reply_to":"9f560f44_5eafeae1","updated":"2020-09-10 22:34:10.000000000","message":"In the future I will be clearer when I\u0027m not asking for a change. Sorry about this.","commit_id":"a0a1a640cd4373376342a28e013e8b064d55128d"},{"author":{"_account_id":10135,"name":"Lee Yarwood","display_name":"Lee Yarwood","email":"lyarwood@redhat.com","username":"lyarwood"},"change_message_id":"561ca8907df5d194f8bfd182bce39a64e88085ee","unresolved":false,"context_lines":[{"line_number":7143,"context_line":"                    libvirt.VIR_MIGRATE_TUNNELLED !\u003d 0):"},{"line_number":7144,"context_line":"                    params.pop(\u0027migrate_disks\u0027)"},{"line_number":7145,"context_line":""},{"line_number":7146,"context_line":"                # NOTE(lyarwood): Only available from v1.3.4"},{"line_number":7147,"context_line":"                if self._host.has_min_version("},{"line_number":7148,"context_line":"                        MIN_LIBVIRT_MIGRATE_PARAM_PERSIST_XML):"},{"line_number":7149,"context_line":"                    params[\u0027persistent_xml\u0027] \u003d new_xml_str"},{"line_number":7150,"context_line":""},{"line_number":7151,"context_line":"            # TODO(sahid): This should be in"},{"line_number":7152,"context_line":"            # post_live_migration_at_source but no way to retrieve"}],"source_content_type":"text/x-python","patch_set":3,"id":"9f560f44_5fbcff04","line":7149,"range":{"start_line":7146,"start_character":0,"end_line":7149,"end_character":58},"in_reply_to":"9f560f44_be872661","updated":"2020-09-11 10:00:17.000000000","message":"No issues :)","commit_id":"a0a1a640cd4373376342a28e013e8b064d55128d"}]}