)]}'
{"nova/tests/unit/virt/libvirt/test_driver.py":[{"author":{"_account_id":6873,"name":"Matt Riedemann","email":"mriedem.os@gmail.com","username":"mriedem"},"change_message_id":"0d863f4b46ea9efbd021f75c21c0254b818e94fe","unresolved":false,"context_lines":[{"line_number":6630,"context_line":"        instance_path \u003d os.path.dirname(disk_info[0][\u0027path\u0027])"},{"line_number":6631,"context_line":"        disk_info_path \u003d os.path.join(instance_path, \u0027disk.info\u0027)"},{"line_number":6632,"context_line":""},{"line_number":6633,"context_line":"        with contextlib.nested("},{"line_number":6634,"context_line":"            mock.patch.object(os, \u0027mkdir\u0027),"},{"line_number":6635,"context_line":"            mock.patch.object(fake_libvirt_utils, \u0027write_to_file\u0027),"},{"line_number":6636,"context_line":"            mock.patch.object(drvr, \u0027_create_images_and_backing\u0027)"}],"source_content_type":"text/x-python","patch_set":1,"id":"5aef4532_e1e367d7","line":6633,"updated":"2016-03-10 01:01:20.000000000","message":"Looks like this is the conflict.","commit_id":"f302bf04ab5dda89cf8ceaeed309006da90c0666"},{"author":{"_account_id":6873,"name":"Matt Riedemann","email":"mriedem.os@gmail.com","username":"mriedem"},"change_message_id":"0d863f4b46ea9efbd021f75c21c0254b818e94fe","unresolved":false,"context_lines":[{"line_number":11680,"context_line":"        dst_disk_info_path \u003d os.path.join(instance_base, \u0027disk.info\u0027)"},{"line_number":11681,"context_line":"        mock_copy.assert_any_call(src_disk_info_path, dst_disk_info_path,"},{"line_number":11682,"context_line":"                                  host\u003dmock.sentinel, on_execute\u003dmock.ANY,"},{"line_number":11683,"context_line":"                                  on_completion\u003dmock.ANY)"},{"line_number":11684,"context_line":""},{"line_number":11685,"context_line":"    def test_wait_for_running(self):"},{"line_number":11686,"context_line":"        def fake_get_info(instance):"}],"source_content_type":"text/x-python","patch_set":1,"id":"5aef4532_81d38303","line":11683,"updated":"2016-03-10 01:01:20.000000000","message":"And compression wasn\u0027t in kilo.","commit_id":"f302bf04ab5dda89cf8ceaeed309006da90c0666"}],"nova/virt/libvirt/driver.py":[{"author":{"_account_id":6873,"name":"Matt Riedemann","email":"mriedem.os@gmail.com","username":"mriedem"},"change_message_id":"0d863f4b46ea9efbd021f75c21c0254b818e94fe","unresolved":false,"context_lines":[{"line_number":6387,"context_line":"            dst_disk_info_path \u003d os.path.join(inst_base, \u0027disk.info\u0027)"},{"line_number":6388,"context_line":"            libvirt_utils.copy_image(src_disk_info_path, dst_disk_info_path,"},{"line_number":6389,"context_line":"                                     host\u003ddest, on_execute\u003don_execute,"},{"line_number":6390,"context_line":"                                     on_completion\u003don_completion)"},{"line_number":6391,"context_line":"        except Exception:"},{"line_number":6392,"context_line":"            with excutils.save_and_reraise_exception():"},{"line_number":6393,"context_line":"                self._cleanup_remote_migration(dest, inst_base,"}],"source_content_type":"text/x-python","patch_set":1,"id":"5aef4532_81fa6373","line":6390,"updated":"2016-03-10 01:01:20.000000000","message":"The compression kwarg wasn\u0027t in kilo which causes the merge conflict.","commit_id":"f302bf04ab5dda89cf8ceaeed309006da90c0666"}]}