)]}'
{"nova/tests/functional/compute/test_live_migration.py":[{"author":{"_account_id":6873,"name":"Matt Riedemann","email":"mriedem.os@gmail.com","username":"mriedem"},"change_message_id":"283bcd3e073a18ef8760b54215a8e6e7b661b264","unresolved":false,"context_lines":[{"line_number":19,"context_line":"from nova.tests import fixtures as nova_fixtures"},{"line_number":20,"context_line":"from nova.tests.functional import integrated_helpers"},{"line_number":21,"context_line":"from nova.tests.unit import fake_notifier"},{"line_number":22,"context_line":"from nova.tests import uuidsentinel as uuids"},{"line_number":23,"context_line":"from nova.virt import fake"},{"line_number":24,"context_line":""},{"line_number":25,"context_line":""}],"source_content_type":"text/x-python","patch_set":2,"id":"3f79a3b5_f4392dd0","line":22,"range":{"start_line":22,"start_character":0,"end_line":22,"end_character":44},"updated":"2018-10-17 13:57:45.000000000","message":"OK this is the conflict due to change I7f5f08691ca3f73073c66c29dddb996fb2c2b266 - would have been nice to note that in the commit message.","commit_id":"cf3c2f391ad0f9d2a2d94247509bcb2709413e4f"},{"author":{"_account_id":8864,"name":"Artom Lifshitz","email":"notartom@gmail.com","username":"artom"},"change_message_id":"ab72b6839e475d2902ba0f6f8bb0698b55f2a4ae","unresolved":false,"context_lines":[{"line_number":19,"context_line":"from nova.tests import fixtures as nova_fixtures"},{"line_number":20,"context_line":"from nova.tests.functional import integrated_helpers"},{"line_number":21,"context_line":"from nova.tests.unit import fake_notifier"},{"line_number":22,"context_line":"from nova.tests import uuidsentinel as uuids"},{"line_number":23,"context_line":"from nova.virt import fake"},{"line_number":24,"context_line":""},{"line_number":25,"context_line":""}],"source_content_type":"text/x-python","patch_set":2,"id":"3f79a3b5_208e7f7a","line":22,"range":{"start_line":22,"start_character":0,"end_line":22,"end_character":44},"in_reply_to":"3f79a3b5_659d6908","updated":"2018-10-17 15:54:19.000000000","message":"Maybe your feelings will grow stronger as you review more backports ;)","commit_id":"cf3c2f391ad0f9d2a2d94247509bcb2709413e4f"},{"author":{"_account_id":6873,"name":"Matt Riedemann","email":"mriedem.os@gmail.com","username":"mriedem"},"change_message_id":"332b811e830c64e65db460c6c9052a2db487be62","unresolved":false,"context_lines":[{"line_number":19,"context_line":"from nova.tests import fixtures as nova_fixtures"},{"line_number":20,"context_line":"from nova.tests.functional import integrated_helpers"},{"line_number":21,"context_line":"from nova.tests.unit import fake_notifier"},{"line_number":22,"context_line":"from nova.tests import uuidsentinel as uuids"},{"line_number":23,"context_line":"from nova.virt import fake"},{"line_number":24,"context_line":""},{"line_number":25,"context_line":""}],"source_content_type":"text/x-python","patch_set":2,"id":"3f79a3b5_659d6908","line":22,"range":{"start_line":22,"start_character":0,"end_line":22,"end_character":44},"in_reply_to":"3f79a3b5_8f6f86c6","updated":"2018-10-17 15:43:57.000000000","message":"I don\u0027t feel strongly about it, otherwise I wouldn\u0027t have +2ed sweet artom.","commit_id":"cf3c2f391ad0f9d2a2d94247509bcb2709413e4f"},{"author":{"_account_id":8864,"name":"Artom Lifshitz","email":"notartom@gmail.com","username":"artom"},"change_message_id":"49b9d9731ba4a156ad34edbefbb24067036f0dd2","unresolved":false,"context_lines":[{"line_number":19,"context_line":"from nova.tests import fixtures as nova_fixtures"},{"line_number":20,"context_line":"from nova.tests.functional import integrated_helpers"},{"line_number":21,"context_line":"from nova.tests.unit import fake_notifier"},{"line_number":22,"context_line":"from nova.tests import uuidsentinel as uuids"},{"line_number":23,"context_line":"from nova.virt import fake"},{"line_number":24,"context_line":""},{"line_number":25,"context_line":""}],"source_content_type":"text/x-python","patch_set":2,"id":"3f79a3b5_8f6f86c6","line":22,"range":{"start_line":22,"start_character":0,"end_line":22,"end_character":44},"in_reply_to":"3f79a3b5_f4392dd0","updated":"2018-10-17 14:34:16.000000000","message":"Wasn\u0027t a conflict per se, it backported cleanly, even passed pep8, but this had to be adjusted as uuidsentinel lived in a different place before Stein. I don\u0027t mind amending the commit message in the other backports if you feel strongly about this.","commit_id":"cf3c2f391ad0f9d2a2d94247509bcb2709413e4f"}]}