)]}'
{"/COMMIT_MSG":[{"author":{"_account_id":17685,"name":"Elod Illes","email":"elod.illes@est.tech","username":"elod.illes"},"change_message_id":"02d958153e42be3f782c7b18c7f732faec05b2cb","unresolved":false,"context_lines":[{"line_number":32,"context_line":"  nova/compute/manager.py"},{"line_number":33,"context_line":""},{"line_number":34,"context_line":"NOTE(stephenfin): Conflicts are due to a number of missing cross-cell"},{"line_number":35,"context_line":"resize changes."},{"line_number":36,"context_line":""},{"line_number":37,"context_line":"[1] https://github.com/openstack/nova/blob/6557d67/nova/compute/resource_tracker.py#L1288"},{"line_number":38,"context_line":"[2] https://github.com/openstack/nova/blob/6557d67/nova/compute/manager.py#L4310-L4315"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":2,"id":"9f560f44_1d5b2af6","line":35,"updated":"2020-09-18 19:54:45.000000000","message":"If I\u0027m not mistaken, this patch causes the conflict (mostly?): I7e7afddbd9e0f57dfb1175a0bb2b54f2ed5500f2","commit_id":"d45ca76a045bf3f8fbfd865bb7add7026b192a07"}],"/PATCHSET_LEVEL":[{"author":{"_account_id":9708,"name":"Balazs Gibizer","display_name":"gibi","email":"gibizer@gmail.com","username":"gibi"},"change_message_id":"9a5e5dc469cc4027a1a8927ccb265dc729f897de","unresolved":false,"context_lines":[],"source_content_type":"","patch_set":3,"id":"01e1047e_229d5e19","updated":"2022-06-15 12:09:00.000000000","message":"Looks good. Elod was +1 before and what he requested is now added. So I\u0027m +2","commit_id":"75f9b288f8edfd24affe5ecbc1f3efb6a63726e4"},{"author":{"_account_id":7634,"name":"Takashi Natsume","email":"takanattie@gmail.com","username":"natsumet"},"change_message_id":"7540a78965fb34745691349b2dd2896a1d397592","unresolved":false,"context_lines":[],"source_content_type":"","patch_set":3,"id":"25845ad8_7cf64ef0","updated":"2022-07-18 01:18:55.000000000","message":"recheck","commit_id":"75f9b288f8edfd24affe5ecbc1f3efb6a63726e4"},{"author":{"_account_id":32238,"name":"wdd","email":"wangzihao@yovole.com","username":"wangzihao"},"change_message_id":"2f4670bba2910e85e45b3186d574083da7f0eb2b","unresolved":false,"context_lines":[],"source_content_type":"","patch_set":3,"id":"ba5ca0b6_b8e01335","updated":"2022-08-08 07:33:29.000000000","message":"recheck","commit_id":"75f9b288f8edfd24affe5ecbc1f3efb6a63726e4"},{"author":{"_account_id":7634,"name":"Takashi Natsume","email":"takanattie@gmail.com","username":"natsumet"},"change_message_id":"b6c6f4ea750ad1d2a50683139c6b44433f3193d2","unresolved":false,"context_lines":[],"source_content_type":"","patch_set":3,"id":"fe4eafdc_aa861699","updated":"2022-07-30 11:23:01.000000000","message":"recheck","commit_id":"75f9b288f8edfd24affe5ecbc1f3efb6a63726e4"},{"author":{"_account_id":17685,"name":"Elod Illes","email":"elod.illes@est.tech","username":"elod.illes"},"change_message_id":"c86bdb9a79bc34c07a36f2005078b4a84f2cb4c7","unresolved":false,"context_lines":[],"source_content_type":"","patch_set":3,"id":"1ad2ddaf_25b97692","updated":"2022-08-17 13:24:39.000000000","message":"recheck - train is now unblocked","commit_id":"75f9b288f8edfd24affe5ecbc1f3efb6a63726e4"},{"author":{"_account_id":7634,"name":"Takashi Natsume","email":"takanattie@gmail.com","username":"natsumet"},"change_message_id":"9a2d42384fc7401317aee3217d8b9f0121ccae9c","unresolved":false,"context_lines":[],"source_content_type":"","patch_set":3,"id":"8a90b027_b87349a4","updated":"2022-08-19 04:13:00.000000000","message":"recheck nova-grenade-multinode timeout","commit_id":"75f9b288f8edfd24affe5ecbc1f3efb6a63726e4"},{"author":{"_account_id":7634,"name":"Takashi Natsume","email":"takanattie@gmail.com","username":"natsumet"},"change_message_id":"e3fea1c20a170405c4c11e44d79f0c6137de0312","unresolved":false,"context_lines":[],"source_content_type":"","patch_set":3,"id":"543bf2f8_21fe2af3","updated":"2022-08-20 02:49:27.000000000","message":"recheck timeout","commit_id":"75f9b288f8edfd24affe5ecbc1f3efb6a63726e4"},{"author":{"_account_id":7634,"name":"Takashi Natsume","email":"takanattie@gmail.com","username":"natsumet"},"change_message_id":"60b3441b3c718be0aacba87834f616bf949f00f5","unresolved":false,"context_lines":[],"source_content_type":"","patch_set":3,"id":"e6cc6f82_a659362a","updated":"2022-08-06 07:32:14.000000000","message":"recheck timeout","commit_id":"75f9b288f8edfd24affe5ecbc1f3efb6a63726e4"}],"nova/compute/manager.py":[{"author":{"_account_id":17685,"name":"Elod Illes","email":"elod.illes@est.tech","username":"elod.illes"},"change_message_id":"02d958153e42be3f782c7b18c7f732faec05b2cb","unresolved":false,"context_lines":[{"line_number":4521,"context_line":"            old_vm_state \u003d instance.system_metadata.get("},{"line_number":4522,"context_line":"                \u0027old_vm_state\u0027, vm_states.ACTIVE)"},{"line_number":4523,"context_line":""},{"line_number":4524,"context_line":"            self._set_instance_info(instance, instance.old_flavor)"},{"line_number":4525,"context_line":"            instance.host \u003d migration.source_compute"},{"line_number":4526,"context_line":"            instance.node \u003d migration.source_node"},{"line_number":4527,"context_line":"            instance.save()"},{"line_number":4528,"context_line":""},{"line_number":4529,"context_line":"            try:"},{"line_number":4530,"context_line":"                source_allocations \u003d self._revert_allocation("}],"source_content_type":"text/x-python","patch_set":2,"id":"9f560f44_7dc3468b","line":4527,"range":{"start_line":4524,"start_character":12,"end_line":4527,"end_character":27},"updated":"2020-09-18 19:54:45.000000000","message":"Actually, every conflict in this file were in methods, introduced by patch I7e7afddbd9e0f57dfb1175a0bb2b54f2ed5500f2, which is not part of Train. *Except* this 4(6) lines, where the original patch used this method:\n\n\n    def _revert_instance_flavor_host_node(self, instance, migration):\n        \"\"\"Revert host, node and flavor fields after a resize-revert.\"\"\"\n        self._set_instance_info(instance, instance.old_flavor)\n        instance.host \u003d migration.source_compute\n        instance.node \u003d migration.source_node\n        instance.save(expected_task_state\u003d[task_states.RESIZE_REVERTING])\n\n\nBut this is not necessary in Train, as this would be the only place where this method would be used. (With the only difference of the \u0027expected_task_state\u0027).","commit_id":"d45ca76a045bf3f8fbfd865bb7add7026b192a07"},{"author":{"_account_id":10135,"name":"Lee Yarwood","display_name":"Lee Yarwood","email":"lyarwood@redhat.com","username":"lyarwood"},"change_message_id":"a4982e5fc953bf90f6c47fc83b8d7f9351a8e571","unresolved":false,"context_lines":[{"line_number":4521,"context_line":"            old_vm_state \u003d instance.system_metadata.get("},{"line_number":4522,"context_line":"                \u0027old_vm_state\u0027, vm_states.ACTIVE)"},{"line_number":4523,"context_line":""},{"line_number":4524,"context_line":"            self._set_instance_info(instance, instance.old_flavor)"},{"line_number":4525,"context_line":"            instance.host \u003d migration.source_compute"},{"line_number":4526,"context_line":"            instance.node \u003d migration.source_node"},{"line_number":4527,"context_line":"            instance.save()"},{"line_number":4528,"context_line":""},{"line_number":4529,"context_line":"            try:"},{"line_number":4530,"context_line":"                source_allocations \u003d self._revert_allocation("}],"source_content_type":"text/x-python","patch_set":2,"id":"e0734db2_2c46cd38","line":4527,"range":{"start_line":4524,"start_character":12,"end_line":4527,"end_character":27},"in_reply_to":"9f560f44_7dc3468b","updated":"2021-02-04 17:05:20.000000000","message":"Right, this ``expected_task_state\u003d[task_states.RESIZE_REVERTING]`` needs to be included here IMHO.","commit_id":"d45ca76a045bf3f8fbfd865bb7add7026b192a07"}]}