)]}'
{"/COMMIT_MSG":[{"author":{"_account_id":17685,"name":"Elod Illes","email":"elod.illes@est.tech","username":"elod.illes"},"change_message_id":"541a6ac7587d1e043f93747954eb0fabbe40a92b","unresolved":false,"context_lines":[{"line_number":27,"context_line":"ports. Because of that, we can replace it with a call to"},{"line_number":28,"context_line":"instance.get_network_info()."},{"line_number":29,"context_line":""},{"line_number":30,"context_line":"Small conflict in nova/tests/unit/compute/test_compute_mgr.py due to"},{"line_number":31,"context_line":"different mocks in the context."},{"line_number":32,"context_line":""},{"line_number":33,"context_line":"[1] https://opendev.org/openstack/nova/src/commit/d9e04c4ff0b1a9c3383f1848dc846e93030d83cb/nova/network/neutronv2/api.py#L2493-L2522"},{"line_number":34,"context_line":""}],"source_content_type":"text/x-gerrit-commit-message","patch_set":2,"id":"9f560f44_607cff70","line":31,"range":{"start_line":30,"start_character":0,"end_line":31,"end_character":31},"updated":"2020-10-09 10:26:55.000000000","message":"Usually we leave here the \u0027conflicts\u0027 lines generated by the cherry-pick itself, which would look like:\n\nConflicts:\n    nova/tests/unit/compute/test_compute_mgr.py\n\nAnd give the explanation of the conflict with a \u0027NOTE\u0027.\n\nAnyway, the note is correct, as the patch that introduced static resource tracker (Ibb8c12fb2799bb5ceb9e3d72a2b86dbb4f14451e) is not present in Rocky, that\u0027s why there is some difference in the resource tracker mocking.","commit_id":"a1d3ae3876eb394bf594625e3c3cd1f0892d9ea6"}]}