)]}'
{"/COMMIT_MSG":[{"author":{"_account_id":15334,"name":"Stephen Finucane","display_name":"stephenfin","email":"stephenfin@redhat.com","username":"sfinucan"},"change_message_id":"3bb15d7929df177a115fc1dfd4d5ebf549a03428","unresolved":true,"context_lines":[{"line_number":20,"context_line":"Closes-Bug: #2095364"},{"line_number":21,"context_line":"Change-Id: If282b8709954f276cb5d48114437809d771a9958"},{"line_number":22,"context_line":"Signed-off-by: Wesley Hershberger \u003cwesley.hershberger@canonical.com\u003e"},{"line_number":23,"context_line":"(cherry picked from commit 509820f156e339e825f799d84b06cb11ac6b6096)"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":1,"id":"81513f60_d4b469a9","line":23,"updated":"2025-07-17 16:35:54.000000000","message":"This was backported to `stable/2025.1` so you need to cherry-pick from there.\n\nhttps://review.opendev.org/c/openstack/nova/+/948061\n\nIn addition, I wasn\u0027t able to cleanly backport this from either branch. Could you please call out the conflicts (ideally include the `Conflicts` section git generates in the comments) and include a note about how you resolved them, in order to help reviewers?","commit_id":"ed26d22615e74ab8298565f6470ffee74a4e6dac"},{"author":{"_account_id":37881,"name":"Wesley Hershberger","display_name":"Wesley Hershberger","email":"wesley.hershberger@canonical.com","username":"whershberger","status":"Support Engineering @ Canonical"},"change_message_id":"ff0d71893a54631fcc3c8739e234820889cdefbc","unresolved":false,"context_lines":[{"line_number":20,"context_line":"Closes-Bug: #2095364"},{"line_number":21,"context_line":"Change-Id: If282b8709954f276cb5d48114437809d771a9958"},{"line_number":22,"context_line":"Signed-off-by: Wesley Hershberger \u003cwesley.hershberger@canonical.com\u003e"},{"line_number":23,"context_line":"(cherry picked from commit 509820f156e339e825f799d84b06cb11ac6b6096)"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":1,"id":"6d8f2e1e_d8ce3401","line":23,"in_reply_to":"0a42bf75_4558f80c","updated":"2025-07-21 20:27:29.000000000","message":"Opened https://review.opendev.org/#/q/Id097a99c832dd482b4ca3230dfab98e188e57bfa","commit_id":"ed26d22615e74ab8298565f6470ffee74a4e6dac"},{"author":{"_account_id":11604,"name":"sean mooney","email":"smooney@redhat.com","username":"sean-k-mooney"},"change_message_id":"29f865e15a608c0fd10fc6133f4c3f3d16b13af0","unresolved":true,"context_lines":[{"line_number":20,"context_line":"Closes-Bug: #2095364"},{"line_number":21,"context_line":"Change-Id: If282b8709954f276cb5d48114437809d771a9958"},{"line_number":22,"context_line":"Signed-off-by: Wesley Hershberger \u003cwesley.hershberger@canonical.com\u003e"},{"line_number":23,"context_line":"(cherry picked from commit 509820f156e339e825f799d84b06cb11ac6b6096)"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":1,"id":"78be02d0_b56800c5","line":23,"in_reply_to":"6d8f2e1e_d8ce3401","updated":"2025-07-24 22:11:11.000000000","message":"this is still incorrect you should have\n```\nCloses-Bug: #2095364\nChange-Id: If282b8709954f276cb5d48114437809d771a9958\nSigned-off-by: Wesley Hershberger \u003cwesley.hershberger@canonical.com\u003e\n(cherry picked from commit 509820f156e339e825f799d84b06cb11ac6b6096)\n(cherry picked from commit 957d97ea30c52292e4105dbcb2ed10a509521ac5)\n```\nyou do not update the cherry picked line form the previous commit you append anotuhger one for each branch.","commit_id":"ed26d22615e74ab8298565f6470ffee74a4e6dac"},{"author":{"_account_id":37881,"name":"Wesley Hershberger","display_name":"Wesley Hershberger","email":"wesley.hershberger@canonical.com","username":"whershberger","status":"Support Engineering @ Canonical"},"change_message_id":"37477f52b12bbab2ca06300825803b5c4f5c0e68","unresolved":false,"context_lines":[{"line_number":20,"context_line":"Closes-Bug: #2095364"},{"line_number":21,"context_line":"Change-Id: If282b8709954f276cb5d48114437809d771a9958"},{"line_number":22,"context_line":"Signed-off-by: Wesley Hershberger \u003cwesley.hershberger@canonical.com\u003e"},{"line_number":23,"context_line":"(cherry picked from commit 509820f156e339e825f799d84b06cb11ac6b6096)"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":1,"id":"0957d428_4a4916ff","line":23,"in_reply_to":"78be02d0_b56800c5","updated":"2025-07-28 16:43:03.000000000","message":"Done","commit_id":"ed26d22615e74ab8298565f6470ffee74a4e6dac"},{"author":{"_account_id":37881,"name":"Wesley Hershberger","display_name":"Wesley Hershberger","email":"wesley.hershberger@canonical.com","username":"whershberger","status":"Support Engineering @ Canonical"},"change_message_id":"35b0111ab18dcda97da3f2692bbb2eca046ca8e5","unresolved":true,"context_lines":[{"line_number":20,"context_line":"Closes-Bug: #2095364"},{"line_number":21,"context_line":"Change-Id: If282b8709954f276cb5d48114437809d771a9958"},{"line_number":22,"context_line":"Signed-off-by: Wesley Hershberger \u003cwesley.hershberger@canonical.com\u003e"},{"line_number":23,"context_line":"(cherry picked from commit 509820f156e339e825f799d84b06cb11ac6b6096)"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":1,"id":"90130d94_8bb3098e","line":23,"in_reply_to":"81513f60_d4b469a9","updated":"2025-07-18 13:29:54.000000000","message":"Thanks for the quick review. Masahito\u0027s was a clean pick from `master` to `stable/2025.1`.\n\nThe only file with conflicts was `nova/api/openstack/compute/views/servers.py`.\n\n[`29d1755`](https://opendev.org/openstack/nova/src/commit/29d17552a701647257fc6abd87316f165fb7b765) (parent of `509820f`) has (which `stable/2024.{1,2}` are missing):\n\n- [L44](https://opendev.org/openstack/nova/src/commit/29d17552a701647257fc6abd87316f165fb7b765/nova/api/openstack/compute/views/servers.py#L44)\n- [L547](https://opendev.org/openstack/nova/src/commit/29d17552a701647257fc6abd87316f165fb7b765/nova/api/openstack/compute/views/servers.py#L547)\n- [L555-L559](https://opendev.org/openstack/nova/src/commit/29d17552a701647257fc6abd87316f165fb7b765/nova/api/openstack/compute/views/servers.py#L555-L559)\n- [L569-L570](https://opendev.org/openstack/nova/src/commit/29d17552a701647257fc6abd87316f165fb7b765/nova/api/openstack/compute/views/servers.py#L569-L570)\n\nThese didn\u0027t conflict on the same line, just the context.\n\nAdditionally, the indentation was changed for [L561-575](https://opendev.org/openstack/nova/src/commit/29d17552a701647257fc6abd87316f165fb7b765/nova/api/openstack/compute/views/servers.py#L561-L575) \n\nMost of the conflicts were introduced by [`2db8af7`](https://opendev.org/openstack/nova/commit/2db8af71dd67779295c8d128d4197eba98ed3dae#diff-2dcb91ff5f81f272848faef1eaa0d341937391d9)\n\nIt\u0027s my understanding that you\u0027re asking for a chain of backports where each pick comes from the next newest stable branch. Wonder if this is something that we can improve in the [contributor guide](https://docs.openstack.org/contributors/code-and-documentation/using-gerrit.html#cherry-picking).","commit_id":"ed26d22615e74ab8298565f6470ffee74a4e6dac"},{"author":{"_account_id":15334,"name":"Stephen Finucane","display_name":"stephenfin","email":"stephenfin@redhat.com","username":"sfinucan"},"change_message_id":"3ab48b8c9cff95cbd1354ec00de08f5e55afd495","unresolved":true,"context_lines":[{"line_number":20,"context_line":"Closes-Bug: #2095364"},{"line_number":21,"context_line":"Change-Id: If282b8709954f276cb5d48114437809d771a9958"},{"line_number":22,"context_line":"Signed-off-by: Wesley Hershberger \u003cwesley.hershberger@canonical.com\u003e"},{"line_number":23,"context_line":"(cherry picked from commit 509820f156e339e825f799d84b06cb11ac6b6096)"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":1,"id":"0a42bf75_4558f80c","line":23,"in_reply_to":"90130d94_8bb3098e","updated":"2025-07-21 15:17:00.000000000","message":"\u003e Thanks for the quick review. Masahito\u0027s was a clean pick from `master` to `stable/2025.1`.\n\u003e \n\u003e The only file with conflicts was `nova/api/openstack/compute/views/servers.py`.\n\u003e \n\u003e [`29d1755`](https://opendev.org/openstack/nova/src/commit/29d17552a701647257fc6abd87316f165fb7b765) (parent of `509820f`) has (which `stable/2024.{1,2}` are missing):\n\u003e \n\u003e - [L44](https://opendev.org/openstack/nova/src/commit/29d17552a701647257fc6abd87316f165fb7b765/nova/api/openstack/compute/views/servers.py#L44)\n\u003e - [L547](https://opendev.org/openstack/nova/src/commit/29d17552a701647257fc6abd87316f165fb7b765/nova/api/openstack/compute/views/servers.py#L547)\n\u003e - [L555-L559](https://opendev.org/openstack/nova/src/commit/29d17552a701647257fc6abd87316f165fb7b765/nova/api/openstack/compute/views/servers.py#L555-L559)\n\u003e - [L569-L570](https://opendev.org/openstack/nova/src/commit/29d17552a701647257fc6abd87316f165fb7b765/nova/api/openstack/compute/views/servers.py#L569-L570)\n\u003e \n\u003e These didn\u0027t conflict on the same line, just the context.\n\u003e \n\u003e Additionally, the indentation was changed for [L561-575](https://opendev.org/openstack/nova/src/commit/29d17552a701647257fc6abd87316f165fb7b765/nova/api/openstack/compute/views/servers.py#L561-L575) \n\u003e \n\u003e Most of the conflicts were introduced by [`2db8af7`](https://opendev.org/openstack/nova/commit/2db8af71dd67779295c8d128d4197eba98ed3dae#diff-2dcb91ff5f81f272848faef1eaa0d341937391d9)\n\nThank you. Would it be possible to get some/all of this in the commit message?\n\n\u003e It\u0027s my understanding that you\u0027re asking for a chain of backports where each pick comes from the next newest stable branch. Wonder if this is something that we can improve in the [contributor guide](https://docs.openstack.org/contributors/code-and-documentation/using-gerrit.html#cherry-picking).\n\nYes, exactly. I\u0027m surprised this is not already documented in that document. It would be a good addition.","commit_id":"ed26d22615e74ab8298565f6470ffee74a4e6dac"},{"author":{"_account_id":11604,"name":"sean mooney","email":"smooney@redhat.com","username":"sean-k-mooney"},"change_message_id":"29f865e15a608c0fd10fc6133f4c3f3d16b13af0","unresolved":true,"context_lines":[{"line_number":16,"context_line":"This commit updates the req_spec_dict to use normal dict object, then"},{"line_number":17,"context_line":"it returns sentinel object if there is no appropriate"},{"line_number":18,"context_line":"request_spec object."},{"line_number":19,"context_line":""},{"line_number":20,"context_line":"Backport notes:"},{"line_number":21,"context_line":"- Conflicts introduced by 2db8af7 in views/servers.py"},{"line_number":22,"context_line":"  - Added L44, L547, L555-559, L569-570"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":3,"id":"925b77d7_0f4fa82f","line":19,"updated":"2025-07-24 22:11:11.000000000","message":"the convetnio nwhen backporting is to leave the conflict lines generated by git\n\nuncomment them and convert the tabs to spaces.\n\nafter or before tthat you can add nodes expcling how you resolved the conflict.","commit_id":"55a6506179e0022952b06eb82547e41f1ede0d43"},{"author":{"_account_id":37881,"name":"Wesley Hershberger","display_name":"Wesley Hershberger","email":"wesley.hershberger@canonical.com","username":"whershberger","status":"Support Engineering @ Canonical"},"change_message_id":"37477f52b12bbab2ca06300825803b5c4f5c0e68","unresolved":false,"context_lines":[{"line_number":16,"context_line":"This commit updates the req_spec_dict to use normal dict object, then"},{"line_number":17,"context_line":"it returns sentinel object if there is no appropriate"},{"line_number":18,"context_line":"request_spec object."},{"line_number":19,"context_line":""},{"line_number":20,"context_line":"Backport notes:"},{"line_number":21,"context_line":"- Conflicts introduced by 2db8af7 in views/servers.py"},{"line_number":22,"context_line":"  - Added L44, L547, L555-559, L569-570"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":3,"id":"cf69945e_e4af47d4","line":19,"in_reply_to":"925b77d7_0f4fa82f","updated":"2025-07-28 16:43:03.000000000","message":"Done","commit_id":"55a6506179e0022952b06eb82547e41f1ede0d43"}],"/PATCHSET_LEVEL":[{"author":{"_account_id":8878,"name":"Masahito Muroi","email":"masahito.muroi@linecorp.com","username":"masa"},"change_message_id":"61b5b02725eb1afea1388e75fabe3db4bf6bccbc","unresolved":false,"context_lines":[],"source_content_type":"","patch_set":2,"id":"2ce88f6c_f2c04b0d","updated":"2025-07-18 15:23:30.000000000","message":"Thank you for the backport for the 2024.2 release.\n\nYes, the v2.100 change introduced the patch conflict.","commit_id":"79135a2ec93b3a8b04359646656e69132da045fb"},{"author":{"_account_id":17685,"name":"Elod Illes","email":"elod.illes@est.tech","username":"elod.illes"},"change_message_id":"7517e2f18ba97f6458f57e0c1158375fea4a85fe","unresolved":false,"context_lines":[],"source_content_type":"","patch_set":4,"id":"e528dd1f_792a2adb","updated":"2025-07-28 16:29:49.000000000","message":"Hi Wesley, thanks for working on this! Actually your Patch Set 3 was perfect, only the commit message needs and update there o:) Could you please revert back to Patch Set 3 and format the commit message something like this:\n\n    Use dict object for request_specs_dict in the _list_view\n    \n    The request_specs_dict in the _list_view is initialized as a\n    defaultdict object in order to return empty string as default.\n    But the request_spec_dict is replaced with a normal dict object in\n    the v2.96 microversion, then if server list and RequestSpec missmatch\n    happens by any reason, the List Server API and the List\n    Server Detail API hit 500 Internal server error because of key error.\n    \n    This commit updates the req_spec_dict to use normal dict object, then\n    it returns sentinel object if there is no appropriate\n    request_spec object.\n    \n    Conflicts:\n      nova/api/openstack/compute/views/servers.py\n    \n    NOTE(Wesley Hershberger): Conflicts introduced by patch in 2025.1 Epoxy\n    (If0070cfbc218e0515bf3b58fc8c5067ae22c7072) that is not backportable.\n    \n    Closes-Bug: #2095364\n    Change-Id: If282b8709954f276cb5d48114437809d771a9958\n    Signed-off-by: Wesley Hershberger \u003cwesley.hershberger@canonical.com\u003e\n    (cherry picked from commit 509820f156e339e825f799d84b06cb11ac6b6096)\n    (cherry picked from commit 957d97ea30c52292e4105dbcb2ed10a509521ac5)","commit_id":"89ab7ad65db12fa57fca8ef2fcd5ae380535ba49"},{"author":{"_account_id":17685,"name":"Elod Illes","email":"elod.illes@est.tech","username":"elod.illes"},"change_message_id":"fdae1b09def12e7a3a06b0175bc2e21866838ba8","unresolved":false,"context_lines":[],"source_content_type":"","patch_set":4,"id":"456b5a40_d5ca6309","in_reply_to":"c4249508_6c237df2","updated":"2025-07-28 16:47:34.000000000","message":"Thanks, too, for your efforts o:) and sorry for our many formatting requests o:)\n\nNevertheless, the cherry pick looks good to me: \n- taken from 2025.1, where the patch has merged\n- conflicts noted and resolved correctly","commit_id":"89ab7ad65db12fa57fca8ef2fcd5ae380535ba49"},{"author":{"_account_id":37881,"name":"Wesley Hershberger","display_name":"Wesley Hershberger","email":"wesley.hershberger@canonical.com","username":"whershberger","status":"Support Engineering @ Canonical"},"change_message_id":"37477f52b12bbab2ca06300825803b5c4f5c0e68","unresolved":false,"context_lines":[],"source_content_type":"","patch_set":4,"id":"c4249508_6c237df2","in_reply_to":"e528dd1f_792a2adb","updated":"2025-07-28 16:43:03.000000000","message":"Thanks for providing an example; this is much more clear what\u0027s being asked for.","commit_id":"89ab7ad65db12fa57fca8ef2fcd5ae380535ba49"},{"author":{"_account_id":15334,"name":"Stephen Finucane","display_name":"stephenfin","email":"stephenfin@redhat.com","username":"sfinucan"},"change_message_id":"5d3f1a4b34774eafce4f585f10234f63d4782d3f","unresolved":false,"context_lines":[],"source_content_type":"","patch_set":5,"id":"6902c87d_98842790","updated":"2025-08-13 12:22:46.000000000","message":"recheck","commit_id":"574c19ab8b1b0d53daa5cb6cc527ba058e42c51d"},{"author":{"_account_id":17685,"name":"Elod Illes","email":"elod.illes@est.tech","username":"elod.illes"},"change_message_id":"316a80bd311ab0929f3c357f869054f1243b403a","unresolved":false,"context_lines":[],"source_content_type":"","patch_set":5,"id":"75bcdbf2_bd395965","updated":"2025-08-13 11:43:20.000000000","message":"recheck - nova-grenade-multinode job failed on gate with a test case:\n\ntest_shelve_unshelve_server\n\nDetails: (ServerActionsTestOtherB:tearDown) Server 1096feab-c786-429b-8f1f-2635c6fc5e48 failed to reach ACTIVE status and task state \"None\" within the required time (196 s). Current status: SHELVED_OFFLOADED. Current task state: None.","commit_id":"574c19ab8b1b0d53daa5cb6cc527ba058e42c51d"},{"author":{"_account_id":11604,"name":"sean mooney","email":"smooney@redhat.com","username":"sean-k-mooney"},"change_message_id":"6f72f6564b0e0ea3e93eba14cfa83b684ed1b2f4","unresolved":false,"context_lines":[],"source_content_type":"","patch_set":5,"id":"8c0c56ae_11845aa7","updated":"2025-08-12 15:26:45.000000000","message":"the commit message is correct and this is merged on 2025.1 so we can proceed with this as its a clean backport beyond the conflict that is called out.","commit_id":"574c19ab8b1b0d53daa5cb6cc527ba058e42c51d"}],"nova/api/openstack/compute/views/servers.py":[{"author":{"_account_id":11604,"name":"sean mooney","email":"smooney@redhat.com","username":"sean-k-mooney"},"change_message_id":"6f72f6564b0e0ea3e93eba14cfa83b684ed1b2f4","unresolved":false,"context_lines":[{"line_number":40,"context_line":""},{"line_number":41,"context_line":""},{"line_number":42,"context_line":"AZ_NOT_IN_REQUEST_SPEC \u003d object()"},{"line_number":43,"context_line":""},{"line_number":44,"context_line":""},{"line_number":45,"context_line":"class ViewBuilder(common.ViewBuilder):"},{"line_number":46,"context_line":"    \"\"\"Model a server API response as a python dictionary.\"\"\""}],"source_content_type":"text/x-python","patch_set":5,"id":"ba0f27bc_3659064b","line":43,"updated":"2025-08-12 15:26:45.000000000","message":"the minor divergance is because the schdluer hints are not shown in older release but overall this is correct","commit_id":"574c19ab8b1b0d53daa5cb6cc527ba058e42c51d"}]}