)]}'
{"nova/compute/manager.py":[{"author":{"_account_id":6873,"name":"Matt Riedemann","email":"mriedem.os@gmail.com","username":"mriedem"},"change_message_id":"b465303487a7c3e6be17158b7498df77dbeed848","unresolved":false,"context_lines":[{"line_number":6530,"context_line":"                self._cleanup_pre_live_migration("},{"line_number":6531,"context_line":"                    context, dest, instance, migration, migrate_data,"},{"line_number":6532,"context_line":"                    source_bdms)"},{"line_number":6533,"context_line":""},{"line_number":6534,"context_line":"        # NOTE(Kevin_Zheng): Pop the migration from the waiting queue"},{"line_number":6535,"context_line":"        # if it exist in the queue, then we are good to moving on, if"},{"line_number":6536,"context_line":"        # not, some other process must have aborted it, then we should"}],"source_content_type":"text/x-python","patch_set":1,"id":"bfb3d3c7_c207311c","line":6533,"updated":"2019-05-22 15:38:34.000000000","message":"Not listed in the commit message so maybe it wasn\u0027t a conflict but I would have expected Idfab9c1cac54d0af7ea3e2a58e616298282ca2f9 to be a conflict as well.","commit_id":"4ff46ff7677530bce3ef268b6a0d85b50308d2fd"}]}