)]}'
{"/COMMIT_MSG":[{"author":{"_account_id":6873,"name":"Matt Riedemann","email":"mriedem.os@gmail.com","username":"mriedem"},"change_message_id":"c084450808c4ccc94901df82c1541d037ea2921f","unresolved":false,"context_lines":[{"line_number":50,"context_line":""},{"line_number":51,"context_line":"[1] https://developer.openstack.org/api-ref/image/v2/index.html#sharing"},{"line_number":52,"context_line":""},{"line_number":53,"context_line":"Conflicts:"},{"line_number":54,"context_line":"        nova/compute/api.py"},{"line_number":55,"context_line":"        nova/compute/utils.py"},{"line_number":56,"context_line":""},{"line_number":57,"context_line":"NOTE(seyeongkim): The conflict is due to not having change"},{"line_number":58,"context_line":"7e229ba40df60b963e0e9450af276c62d4b6bf60 in Rocky."},{"line_number":59,"context_line":""},{"line_number":60,"context_line":"        nova/tests/functional/test_images.py"},{"line_number":61,"context_line":""},{"line_number":62,"context_line":"NOTE(seyeongkim) The conflict is due to not having correct uuidsentiel"},{"line_number":63,"context_line":"position."},{"line_number":64,"context_line":""},{"line_number":65,"context_line":"Change-Id: If53bc8fa8ab4a8a9072061af7afed53fc12c97a5"},{"line_number":66,"context_line":"Closes-Bug: #1675791"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":1,"id":"9fb8cfa7_e9fac840","line":63,"range":{"start_line":53,"start_character":0,"end_line":63,"end_character":9},"updated":"2019-07-01 16:15:20.000000000","message":"These are specific to stable/rocky, right? The backport here is for stable/queens, so these are likely not the same conflicts.","commit_id":"dc8e0f20c770488dd6825c64915a159a67215bd9"},{"author":{"_account_id":6873,"name":"Matt Riedemann","email":"mriedem.os@gmail.com","username":"mriedem"},"change_message_id":"c084450808c4ccc94901df82c1541d037ea2921f","unresolved":false,"context_lines":[],"source_content_type":"","patch_set":1,"id":"9fb8cfa7_498514ac","line":68,"updated":"2019-07-01 16:15:20.000000000","message":"Did you cherry pick this from stein -\u003e queens or from rocky (6ca6f6fce691863901b01d37b8f6e3eadb2bcec4) to queens and forget the -x option on the git cherry-pick command? I would like to see the queens backport cherry-picked from the rocky 6ca6f6fce691863901b01d37b8f6e3eadb2bcec4 commit with an explanation of the queens-specific conflicts in the commit message (you can overwrite the rocky-specific conflict notes here - they don\u0027t apply to queens).","commit_id":"dc8e0f20c770488dd6825c64915a159a67215bd9"},{"author":{"_account_id":17685,"name":"Elod Illes","email":"elod.illes@est.tech","username":"elod.illes"},"change_message_id":"2686de455e611eedd6e48c7725cd0d61e749bfa9","unresolved":false,"context_lines":[{"line_number":50,"context_line":""},{"line_number":51,"context_line":"[1] https://developer.openstack.org/api-ref/image/v2/index.html#sharing"},{"line_number":52,"context_line":""},{"line_number":53,"context_line":"Conflicts:"},{"line_number":54,"context_line":"        nova/compute/api.py"},{"line_number":55,"context_line":"        nova/compute/utils.py"},{"line_number":56,"context_line":""},{"line_number":57,"context_line":"NOTE(seyeongkim) The conflict is due to not having specific files in"},{"line_number":58,"context_line":"queens."}],"source_content_type":"text/x-gerrit-commit-message","patch_set":2,"id":"3fa7e38b_594aaf83","line":55,"range":{"start_line":53,"start_character":0,"end_line":55,"end_character":29},"updated":"2019-10-01 16:27:07.000000000","message":"If you cherry-pick the patch from stable/rocky, then there shouldn\u0027t be conflict with these files. Please remove this section.","commit_id":"bd462e57efe1628e0dbbcec2562e7eca271ec256"},{"author":{"_account_id":17685,"name":"Elod Illes","email":"elod.illes@est.tech","username":"elod.illes"},"change_message_id":"2686de455e611eedd6e48c7725cd0d61e749bfa9","unresolved":false,"context_lines":[{"line_number":63,"context_line":"        nova/virt/powervm/image.py"},{"line_number":64,"context_line":"        nova/virt/zvm/driver.py"},{"line_number":65,"context_line":""},{"line_number":66,"context_line":"Change-Id: If53bc8fa8ab4a8a9072061af7afed53fc12c97a5"},{"line_number":67,"context_line":"Closes-Bug: #1675791"},{"line_number":68,"context_line":"(cherry picked from commit 6ca6f6fce691863901b01d37b8f6e3eadb2bcec4)"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":2,"id":"3fa7e38b_3917b354","line":68,"range":{"start_line":66,"start_character":0,"end_line":68,"end_character":68},"updated":"2019-10-01 16:27:07.000000000","message":"If you cherry-pick the patch from stable/rocky with \u0027-x\u0027 option, then this section would look like this:\n\nChange-Id: If53bc8fa8ab4a8a9072061af7afed53fc12c97a5\nCloses-Bug: #1675791\n(cherry picked from commit 35cc0f5e943642dd8d9dacbf0dac6e260f708d7d)\n(cherry picked from commit 6ca6f6fce691863901b01d37b8f6e3eadb2bcec4)\n\nPlease update.","commit_id":"bd462e57efe1628e0dbbcec2562e7eca271ec256"}]}