)]}'
{"nova/compute/rpcapi.py":[{"author":{"_account_id":6873,"name":"Matt Riedemann","email":"mriedem.os@gmail.com","username":"mriedem"},"change_message_id":"f121347a4cc77509754755a1f6dc66e197c331f5","unresolved":false,"context_lines":[{"line_number":806,"context_line":"                          block_migration\u003dblock_migration,"},{"line_number":807,"context_line":"                          disk\u003ddisk, migrate_data\u003dmigrate_data)"},{"line_number":808,"context_line":""},{"line_number":809,"context_line":"    # TODO(mriedem): Drop compat for request_spec being a legacy dict in v6.0."},{"line_number":810,"context_line":"    def prep_resize(self, ctxt, instance, image, instance_type, host,"},{"line_number":811,"context_line":"                    migration, request_spec, filter_properties, node,"},{"line_number":812,"context_line":"                    clean_shutdown, host_list):"}],"source_content_type":"text/x-python","patch_set":2,"id":"3fa7e38b_95de1c6b","line":809,"updated":"2019-09-24 18:31:53.000000000","message":"The conflict is due to this:\n\nhttps://review.opendev.org/#/c/683948/3/nova/compute/rpcapi.py","commit_id":"95331cea1fb53e0c289957be2d702435836812aa"}],"nova/conductor/manager.py":[{"author":{"_account_id":14070,"name":"Eric Fried","email":"openstack@fried.cc","username":"efried"},"change_message_id":"cffe27fa07bdcb424cd0dd96dc550e1c02a1e967","unresolved":false,"context_lines":[{"line_number":321,"context_line":"                project_id\u003dinstance.project_id, user_id\u003dinstance.user_id)"},{"line_number":322,"context_line":"        elif not isinstance(request_spec, objects.RequestSpec):"},{"line_number":323,"context_line":"            # Prior to compute RPC API 5.1 conductor would pass a legacy dict"},{"line_number":324,"context_line":"            # version of the request spec to compute and since Stein compute"},{"line_number":325,"context_line":"            # could be sending that back to conductor on reschedule, so if we"},{"line_number":326,"context_line":"            # got a dict convert it to an object."},{"line_number":327,"context_line":"            # TODO(mriedem): We can drop this compat code when we only support"}],"source_content_type":"text/x-python","patch_set":1,"id":"5faad753_95917e9c","line":324,"range":{"start_line":324,"start_character":57,"end_line":324,"end_character":62},"updated":"2019-09-10 19:16:20.000000000","message":"strike","commit_id":"f9c4c34b77d47df162f276087ae5b4b6e5853c47"},{"author":{"_account_id":9708,"name":"Balazs Gibizer","display_name":"gibi","email":"gibizer@gmail.com","username":"gibi"},"change_message_id":"b2ebed4d4910c9fb5c4dfbedbd19d0e1c4e33bbc","unresolved":false,"context_lines":[{"line_number":321,"context_line":"                project_id\u003dinstance.project_id, user_id\u003dinstance.user_id)"},{"line_number":322,"context_line":"        elif not isinstance(request_spec, objects.RequestSpec):"},{"line_number":323,"context_line":"            # Prior to compute RPC API 5.1 conductor would pass a legacy dict"},{"line_number":324,"context_line":"            # version of the request spec to compute and since Stein compute"},{"line_number":325,"context_line":"            # could be sending that back to conductor on reschedule, so if we"},{"line_number":326,"context_line":"            # got a dict convert it to an object."},{"line_number":327,"context_line":"            # TODO(mriedem): We can drop this compat code when we only support"}],"source_content_type":"text/x-python","patch_set":1,"id":"3fa7e38b_f3f48889","line":324,"range":{"start_line":324,"start_character":57,"end_line":324,"end_character":62},"in_reply_to":"5faad753_95917e9c","updated":"2019-09-20 15:06:19.000000000","message":"Done","commit_id":"f9c4c34b77d47df162f276087ae5b4b6e5853c47"},{"author":{"_account_id":6873,"name":"Matt Riedemann","email":"mriedem.os@gmail.com","username":"mriedem"},"change_message_id":"1f4d109eac9bbd437d82529d90e769ae004fe179","unresolved":false,"context_lines":[{"line_number":321,"context_line":"                project_id\u003dinstance.project_id, user_id\u003dinstance.user_id)"},{"line_number":322,"context_line":"        elif not isinstance(request_spec, objects.RequestSpec):"},{"line_number":323,"context_line":"            # Prior to compute RPC API 5.1 conductor would pass a legacy dict"},{"line_number":324,"context_line":"            # version of the request spec to compute and since Stein compute"},{"line_number":325,"context_line":"            # could be sending that back to conductor on reschedule, so if we"},{"line_number":326,"context_line":"            # got a dict convert it to an object."},{"line_number":327,"context_line":"            # TODO(mriedem): We can drop this compat code when we only support"}],"source_content_type":"text/x-python","patch_set":3,"id":"3fa7e38b_350c08ec","line":324,"range":{"start_line":324,"start_character":57,"end_line":324,"end_character":62},"updated":"2019-09-24 18:34:07.000000000","message":"crap this snuck back in","commit_id":"cc3b9ca93d55447c509c7724ca97bbb196c9ac41"}]}