)]}'
{"/COMMIT_MSG":[{"author":{"_account_id":17685,"name":"Elod Illes","email":"elod.illes@est.tech","username":"elod.illes"},"change_message_id":"9c4ad2f8105fffa617740c3a37499420dc664b9b","unresolved":false,"context_lines":[{"line_number":11,"context_line":"if the original volume is not in the same 3PAR backend, the new"},{"line_number":12,"context_line":"volume is renamed to the original volume\u0027s name."},{"line_number":13,"context_line":""},{"line_number":14,"context_line":"Conflicts:"},{"line_number":15,"context_line":"\tcinder/tests/unit/volume/drivers/hpe/test_hpe3par.py"},{"line_number":16,"context_line":""},{"line_number":17,"context_line":"Closes-Bug: 1858119"},{"line_number":18,"context_line":"Change-Id: I1f9d4143d1ad2637a2173090b290f6f96b64c492"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":1,"id":"9f560f44_a2732d15","line":15,"range":{"start_line":14,"start_character":0,"end_line":15,"end_character":53},"updated":"2020-07-29 08:23:22.000000000","message":"This was true for the patch in Stein, but the cherry pick applies without any conflict to Rocky. So this should be removed.","commit_id":"949a788ad541b35b3019d17ae2dcda3caab26abf"},{"author":{"_account_id":21129,"name":"Alan Bishop","email":"abishopsweng@gmail.com","username":"ASBishop","status":"ex Red Hat"},"change_message_id":"f464fb51605e012851e74072ca5b9f34a9c6ab5e","unresolved":false,"context_lines":[{"line_number":11,"context_line":"if the original volume is not in the same 3PAR backend, the new"},{"line_number":12,"context_line":"volume is renamed to the original volume\u0027s name."},{"line_number":13,"context_line":""},{"line_number":14,"context_line":"Conflicts:"},{"line_number":15,"context_line":"\tcinder/tests/unit/volume/drivers/hpe/test_hpe3par.py"},{"line_number":16,"context_line":""},{"line_number":17,"context_line":"Closes-Bug: 1858119"},{"line_number":18,"context_line":"Change-Id: I1f9d4143d1ad2637a2173090b290f6f96b64c492"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":1,"id":"5ca1bf76_91723490","line":15,"range":{"start_line":14,"start_character":0,"end_line":15,"end_character":53},"in_reply_to":"9f560f44_a2732d15","updated":"2021-08-23 14:11:45.000000000","message":"This is why the list of conflicts should always appear at the very end of the patch to which they apply , immediately after the \"cherry picked from\" line (with no additional blank line).\n\nThat way, any subsequent backports append their own \"cherry picked from\" line, and it\u0027s clear which patches had conflicts and which ones did not.","commit_id":"949a788ad541b35b3019d17ae2dcda3caab26abf"}],"cinder/tests/unit/volume/drivers/hpe/test_hpe3par.py":[{"author":{"_account_id":32266,"name":"Venkata krishna Thumu","display_name":"VenkataKrishna","email":"venkata.krishna.reddy@ibm.com","username":"venkatakrishnathumu","status":"Active"},"change_message_id":"10194655ceaca089d433e195442965d52df29d91","unresolved":true,"context_lines":[{"line_number":3100,"context_line":"            ]"},{"line_number":3101,"context_line":""},{"line_number":3102,"context_line":"            # Primary rename will occur unless the temp rename fails"},{"line_number":3103,"context_line":"            if temp_rename_side_effect !\u003d hpeexceptions.HTTPConflict:"},{"line_number":3104,"context_line":"                expected +\u003d ["},{"line_number":3105,"context_line":"                    mock.call.modifyVolume("},{"line_number":3106,"context_line":"                        \u0027osv-0DM4qZEVSKON-AAAAAAAAA\u0027,"}],"source_content_type":"text/x-python","patch_set":1,"id":"1d529985_effb323d","line":3103,"updated":"2021-08-23 14:02:25.000000000","message":"As the value of \u0027temp_rename_side_effect\u0027 never equals to \u0027hpeexceptions.HTTPConflict\u0027 in this UT, you can updated \u0027expected\u0027 without a condition.","commit_id":"949a788ad541b35b3019d17ae2dcda3caab26abf"},{"author":{"_account_id":21129,"name":"Alan Bishop","email":"abishopsweng@gmail.com","username":"ASBishop","status":"ex Red Hat"},"change_message_id":"f464fb51605e012851e74072ca5b9f34a9c6ab5e","unresolved":true,"context_lines":[{"line_number":3100,"context_line":"            ]"},{"line_number":3101,"context_line":""},{"line_number":3102,"context_line":"            # Primary rename will occur unless the temp rename fails"},{"line_number":3103,"context_line":"            if temp_rename_side_effect !\u003d hpeexceptions.HTTPConflict:"},{"line_number":3104,"context_line":"                expected +\u003d ["},{"line_number":3105,"context_line":"                    mock.call.modifyVolume("},{"line_number":3106,"context_line":"                        \u0027osv-0DM4qZEVSKON-AAAAAAAAA\u0027,"}],"source_content_type":"text/x-python","patch_set":1,"id":"c8e7ff8d_31edb4d0","line":3103,"in_reply_to":"1d529985_effb323d","updated":"2021-08-23 14:11:45.000000000","message":"Sure, but this is a backport and the comment would apply to the original patch. We don\u0027t modify code in backports except to resolve conflicts.","commit_id":"949a788ad541b35b3019d17ae2dcda3caab26abf"}],"cinder/volume/drivers/hpe/hpe_3par_common.py":[{"author":{"_account_id":5997,"name":"Walt","display_name":"Hemna","email":"waboring@hemna.com","username":"walter-boring","status":"SAP"},"change_message_id":"dc33a3fa072d7fd524b3d7a73aa33cb85b9a466d","unresolved":true,"context_lines":[{"line_number":2839,"context_line":"                if original_volume_renamed:"},{"line_number":2840,"context_line":"                    LOG.error(\"To restore the original volume, it must be \""},{"line_number":2841,"context_line":"                              \"manually renamed from %(temp)s to %(orig)s\","},{"line_number":2842,"context_line":"                              {\u0027temp\u0027: temp_name, \u0027orig\u0027: original_name})"},{"line_number":2843,"context_line":"                raise"},{"line_number":2844,"context_line":""},{"line_number":2845,"context_line":"            # If it was renamed, rename the original volume again to the"}],"source_content_type":"text/x-python","patch_set":1,"id":"87def0cf_140e2dff","line":2842,"updated":"2022-06-28 20:33:45.000000000","message":"should add\nresource\u003dvolume to your log calls","commit_id":"949a788ad541b35b3019d17ae2dcda3caab26abf"},{"author":{"_account_id":21129,"name":"Alan Bishop","email":"abishopsweng@gmail.com","username":"ASBishop","status":"ex Red Hat"},"change_message_id":"1bc9e3e2b0f100e946e608df6a90f2b06d09f099","unresolved":true,"context_lines":[{"line_number":2839,"context_line":"                if original_volume_renamed:"},{"line_number":2840,"context_line":"                    LOG.error(\"To restore the original volume, it must be \""},{"line_number":2841,"context_line":"                              \"manually renamed from %(temp)s to %(orig)s\","},{"line_number":2842,"context_line":"                              {\u0027temp\u0027: temp_name, \u0027orig\u0027: original_name})"},{"line_number":2843,"context_line":"                raise"},{"line_number":2844,"context_line":""},{"line_number":2845,"context_line":"            # If it was renamed, rename the original volume again to the"}],"source_content_type":"text/x-python","patch_set":1,"id":"0d5b929b_c309844a","line":2842,"in_reply_to":"87def0cf_140e2dff","updated":"2022-06-28 21:58:26.000000000","message":"Good thought, but this is a backport that shouldn\u0027t change. I believe there are subsequent changes to the log message in later releases, so they could also be backported if appropriate.","commit_id":"949a788ad541b35b3019d17ae2dcda3caab26abf"}]}