)]}'
{"nova/virt/hyperv/hostops.py":[{"author":{"_account_id":9708,"name":"Balazs Gibizer","display_name":"gibi","email":"gibizer@gmail.com","username":"gibi"},"change_message_id":"ad3a3e7ffb86d4ad297f048639853bfe259ce8f6","unresolved":false,"context_lines":[{"line_number":98,"context_line":""},{"line_number":99,"context_line":"        # NOTE(claudiub): The hypervisor_version will be stored in the database"},{"line_number":100,"context_line":"        # as an Integer and it will be used by the scheduler, if required by"},{"line_number":101,"context_line":"        # the image property \u0027img_hv_requested_version\u0027."},{"line_number":102,"context_line":"        # The hypervisor_version will then be converted back to a version"},{"line_number":103,"context_line":"        # by splitting the int in groups of 3 digits."},{"line_number":104,"context_line":"        # E.g.: hypervisor_version 6003 is converted to \u00276.3\u0027."}],"source_content_type":"text/x-python","patch_set":5,"id":"9f560f44_edb52dd2","line":101,"updated":"2020-08-31 12:48:04.000000000","message":"This would have been better to add into https://review.opendev.org/#/c/744198 but that is merged so lets have it here.","commit_id":"b545bf69ce46bca49d954ce6e3371c8b9ef70f97"}],"nova/virt/libvirt/vif.py":[{"author":{"_account_id":15334,"name":"Stephen Finucane","display_name":"stephenfin","email":"stephenfin@redhat.com","username":"sfinucan"},"change_message_id":"04eda4b5ef57933b4a9c74a68302cc742a09e5f8","unresolved":false,"context_lines":[{"line_number":67,"context_line":"        network_model.VIF_MODEL_E1000,"},{"line_number":68,"context_line":"        network_model.VIF_MODEL_E1000E,"},{"line_number":69,"context_line":"        network_model.VIF_MODEL_LAN9118,"},{"line_number":70,"context_line":"        network_model.VIF_MODEL_SPAPR_VLAN,"},{"line_number":71,"context_line":"    ],"},{"line_number":72,"context_line":"    \u0027kvm\u0027: ["},{"line_number":73,"context_line":"        network_model.VIF_MODEL_VIRTIO,"}],"source_content_type":"text/x-python","patch_set":4,"id":"9f560f44_c71c8a79","line":70,"range":{"start_line":70,"start_character":42,"end_line":70,"end_character":43},"updated":"2020-08-31 11:00:13.000000000","message":"There\u0027s a merge conflict here now due to I95203af4ded9a4dbecfb7981b400f0fb988f2d47","commit_id":"da422e521027f1610faa88176df8c3822f22bb0a"}]}
