)]}'
{"/COMMIT_MSG":[{"author":{"_account_id":10135,"name":"Lee Yarwood","display_name":"Lee Yarwood","email":"lyarwood@redhat.com","username":"lyarwood"},"change_message_id":"5dda0ad35d43fb022776d234b829347209db9a06","unresolved":false,"context_lines":[{"line_number":67,"context_line":"        from QEMU for help on I/O latency instrumentation with `perf`."},{"line_number":68,"context_line":""},{"line_number":69,"context_line":"Conflicts [stable/ocata]:"},{"line_number":70,"context_line":" - libvirt/driver.py: The _get_scsi_controller() method from Git master"},{"line_number":71,"context_line":"   isn\u0027t in Ocata, so adjust the _get_guest_storage_config() method"},{"line_number":72,"context_line":"   accordingly."},{"line_number":73,"context_line":" - Fix unit test conflicts in the method"},{"line_number":74,"context_line":"   test_attach_volume_with_vir_domain_affect_live_flag()."},{"line_number":75,"context_line":""}],"source_content_type":"text/x-gerrit-commit-message","patch_set":1,"id":"df3967d1_99eb3aaf","line":72,"range":{"start_line":70,"start_character":0,"end_line":72,"end_character":15},"updated":"2017-07-31 12:48:33.000000000","message":"So this is slightly confusing but kudos for yet again trying to document everything! There are no changes to the backported code introduced by this conflict so IMHO we don\u0027t even need to document it here.","commit_id":"e17e0c88c7f5dc7d8a784293eca3abd5f4e3d244"},{"author":{"_account_id":6962,"name":"Kashyap Chamarthy","email":"kchamart@redhat.com","username":"kashyapc"},"change_message_id":"e6a9d840303a44ca62a615728ba4d8860a80506c","unresolved":false,"context_lines":[{"line_number":67,"context_line":"        from QEMU for help on I/O latency instrumentation with `perf`."},{"line_number":68,"context_line":""},{"line_number":69,"context_line":"Conflicts [stable/ocata]:"},{"line_number":70,"context_line":" - libvirt/driver.py: The _get_scsi_controller() method from Git master"},{"line_number":71,"context_line":"   isn\u0027t in Ocata, so adjust the _get_guest_storage_config() method"},{"line_number":72,"context_line":"   accordingly."},{"line_number":73,"context_line":" - Fix unit test conflicts in the method"},{"line_number":74,"context_line":"   test_attach_volume_with_vir_domain_affect_live_flag()."},{"line_number":75,"context_line":""}],"source_content_type":"text/x-gerrit-commit-message","patch_set":1,"id":"df3967d1_eaedc225","line":72,"range":{"start_line":70,"start_character":0,"end_line":72,"end_character":15},"in_reply_to":"df3967d1_99eb3aaf","updated":"2017-07-31 14:21:58.000000000","message":"Hmm, I don\u0027t see the confusion. I explicitly noted the \"conflicts\" just as a little primer for reviewer to ensure I didn\u0027t screw up anything :-)\n\nThanks for the review!","commit_id":"e17e0c88c7f5dc7d8a784293eca3abd5f4e3d244"}]}