)]}'
{"/COMMIT_MSG":[{"author":{"_account_id":4690,"name":"melanie witt","display_name":"melwitt","email":"melwittt@gmail.com","username":"melwitt"},"change_message_id":"1ddeebc56159c74363d53f40fe7d5532e721b05c","unresolved":false,"context_lines":[{"line_number":12,"context_line":""},{"line_number":13,"context_line":"Conflicts:"},{"line_number":14,"context_line":"\tnova/tests/unit/virt/ironic/test_client_wrapper.py"},{"line_number":15,"context_line":"From change I5f78d21c39ed2fd58d2a0f3649116e39883d5a2c which renamed the"},{"line_number":16,"context_line":"\u0027endpoint\u0027 key in the ironicclient get_client kwargs to \u0027ironic_url\u0027."},{"line_number":17,"context_line":""},{"line_number":18,"context_line":"Change-Id: I31fa1c6fb0b224fbb02f9ebf68abc6a3728e9389"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":1,"id":"ffb9cba7_a4119406","line":15,"range":{"start_line":15,"start_character":12,"end_line":15,"end_character":53},"updated":"2019-04-30 21:43:42.000000000","message":"I don\u0027t see that this change renamed the key, but rather this one did:\n\nI1b3ce1955622c40b780c0b15ec7e09be3e8ace72","commit_id":"6da4c7fbfd6d3d54111e8089f77a37cb295e9754"},{"author":{"_account_id":14070,"name":"Eric Fried","email":"openstack@fried.cc","username":"efried"},"change_message_id":"36b421e508cbac574cbd38e0cd735160d4594043","unresolved":false,"context_lines":[{"line_number":12,"context_line":""},{"line_number":13,"context_line":"Conflicts:"},{"line_number":14,"context_line":"\tnova/tests/unit/virt/ironic/test_client_wrapper.py"},{"line_number":15,"context_line":"From change I5f78d21c39ed2fd58d2a0f3649116e39883d5a2c which renamed the"},{"line_number":16,"context_line":"\u0027endpoint\u0027 key in the ironicclient get_client kwargs to \u0027ironic_url\u0027."},{"line_number":17,"context_line":""},{"line_number":18,"context_line":"Change-Id: I31fa1c6fb0b224fbb02f9ebf68abc6a3728e9389"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":1,"id":"ffb9cba7_c74e0a6e","line":15,"range":{"start_line":15,"start_character":12,"end_line":15,"end_character":53},"in_reply_to":"ffb9cba7_a4119406","updated":"2019-04-30 22:53:05.000000000","message":"Yes, you\u0027re right; the one I noted was the last one to touch that line.","commit_id":"6da4c7fbfd6d3d54111e8089f77a37cb295e9754"},{"author":{"_account_id":4690,"name":"melanie witt","display_name":"melwitt","email":"melwittt@gmail.com","username":"melwitt"},"change_message_id":"1ddeebc56159c74363d53f40fe7d5532e721b05c","unresolved":false,"context_lines":[{"line_number":13,"context_line":"Conflicts:"},{"line_number":14,"context_line":"\tnova/tests/unit/virt/ironic/test_client_wrapper.py"},{"line_number":15,"context_line":"From change I5f78d21c39ed2fd58d2a0f3649116e39883d5a2c which renamed the"},{"line_number":16,"context_line":"\u0027endpoint\u0027 key in the ironicclient get_client kwargs to \u0027ironic_url\u0027."},{"line_number":17,"context_line":""},{"line_number":18,"context_line":"Change-Id: I31fa1c6fb0b224fbb02f9ebf68abc6a3728e9389"},{"line_number":19,"context_line":"Partial-Bug: #1825583"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":1,"id":"ffb9cba7_8425705e","line":16,"updated":"2019-04-30 21:43:42.000000000","message":"There looks to be an additional change that\u0027s part of the conflict too, that change I1b184ff37948dc403fe38874613cd4d870c644fd is not in Rocky. Should also note this in the commit message methinks.","commit_id":"6da4c7fbfd6d3d54111e8089f77a37cb295e9754"},{"author":{"_account_id":4690,"name":"melanie witt","display_name":"melwitt","email":"melwittt@gmail.com","username":"melwitt"},"change_message_id":"cb46ec113f97332158e9926dd4c4911fd265d3c4","unresolved":false,"context_lines":[{"line_number":13,"context_line":"Conflicts:"},{"line_number":14,"context_line":"\tnova/tests/unit/virt/ironic/test_client_wrapper.py"},{"line_number":15,"context_line":"From change I5f78d21c39ed2fd58d2a0f3649116e39883d5a2c which renamed the"},{"line_number":16,"context_line":"\u0027endpoint\u0027 key in the ironicclient get_client kwargs to \u0027ironic_url\u0027."},{"line_number":17,"context_line":""},{"line_number":18,"context_line":"Change-Id: I31fa1c6fb0b224fbb02f9ebf68abc6a3728e9389"},{"line_number":19,"context_line":"Partial-Bug: #1825583"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":1,"id":"ffb9cba7_a7df5638","line":16,"in_reply_to":"ffb9cba7_0748a259","updated":"2019-04-30 23:08:07.000000000","message":"OK, but that was the specific change that made the cherry-pick here have a merge conflict for that line, AFAICT. That\u0027s normally how I write the conflict NOTE.","commit_id":"6da4c7fbfd6d3d54111e8089f77a37cb295e9754"},{"author":{"_account_id":14070,"name":"Eric Fried","email":"openstack@fried.cc","username":"efried"},"change_message_id":"36b421e508cbac574cbd38e0cd735160d4594043","unresolved":false,"context_lines":[{"line_number":13,"context_line":"Conflicts:"},{"line_number":14,"context_line":"\tnova/tests/unit/virt/ironic/test_client_wrapper.py"},{"line_number":15,"context_line":"From change I5f78d21c39ed2fd58d2a0f3649116e39883d5a2c which renamed the"},{"line_number":16,"context_line":"\u0027endpoint\u0027 key in the ironicclient get_client kwargs to \u0027ironic_url\u0027."},{"line_number":17,"context_line":""},{"line_number":18,"context_line":"Change-Id: I31fa1c6fb0b224fbb02f9ebf68abc6a3728e9389"},{"line_number":19,"context_line":"Partial-Bug: #1825583"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":1,"id":"ffb9cba7_0748a259","line":16,"in_reply_to":"ffb9cba7_8425705e","updated":"2019-04-30 22:53:05.000000000","message":"It\u0027s not specifically that change. Each release updates the latest/previous os-ironic-api-version. This change doesn\u0027t mess with those, so the backport just has to make sure to use the existing versions for the release. I\u0027ll make some words.","commit_id":"6da4c7fbfd6d3d54111e8089f77a37cb295e9754"}]}