)]}'
{"/COMMIT_MSG":[{"author":{"_account_id":17685,"name":"Elod Illes","email":"elod.illes@est.tech","username":"elod.illes"},"change_message_id":"c948740036350ab601b756959e13674cf20e4a30","unresolved":true,"context_lines":[{"line_number":13,"context_line":"Conflicts:"},{"line_number":14,"context_line":"    keystone/tests/unit/test_contrib_ec2_core.py"},{"line_number":15,"context_line":"    keystone/tests/unit/test_contrib_s3_core.py"},{"line_number":16,"context_line":"    keystone/tests/unit/test_v3_credential.py"},{"line_number":17,"context_line":""},{"line_number":18,"context_line":"Closes-Bug: 2119646"},{"line_number":19,"context_line":"Change-Id: Ic84b84247e05f29874e2c5636a033aaedd4de83c"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":2,"id":"2397d48b_3c5620ce","line":16,"updated":"2025-12-02 09:48:08.000000000","message":"conflicts are due to 2 missing patches, which are somewhat incorporated in this backport:\n1) \"Add test with noauth for s3tokens and ec2tokens\" [1]\n   this patch could have been cherry picked separately i think, as it is fully part of this backport\n2) \"Blackify the keystone code base\" [2]\n   this is something that we clearly don\u0027t want to backport: however the changes are trivial, it is a huge patch (on the other hand this will impact a lot of backports, sadly). nevertheless, a tiny partial backport could make this bug fix backport cleanly appliable.\n\n[1] https://review.opendev.org/c/openstack/keystone/+/908763\n[2] https://review.opendev.org/c/openstack/keystone/+/924522","commit_id":"4f51cdcc5c1f4f082a5fffd470d1f65b6fa65ecd"}],"/PATCHSET_LEVEL":[{"author":{"_account_id":1131,"name":"Brian Haley","email":"haleyb.dev@gmail.com","username":"brian-haley"},"change_message_id":"08a74be39db74d1d4139f3f7d5314f71d2df2cd0","unresolved":false,"context_lines":[],"source_content_type":"","patch_set":2,"id":"dff60d45_8483fe6c","updated":"2025-11-12 19:28:04.000000000","message":"Merge conflicts fixed","commit_id":"4f51cdcc5c1f4f082a5fffd470d1f65b6fa65ecd"},{"author":{"_account_id":17685,"name":"Elod Illes","email":"elod.illes@est.tech","username":"elod.illes"},"change_message_id":"c948740036350ab601b756959e13674cf20e4a30","unresolved":false,"context_lines":[],"source_content_type":"","patch_set":2,"id":"7e2db687_a6a65605","updated":"2025-12-02 09:48:08.000000000","message":"Thanks for all the reviews, only the conflicting files were a bit hard to resolve (see my comment in the commit message) otherwise the backport seems to be fine to me. Considering that this is on an unmaintained branch and the patch is reviewed by others already (thanks again for that!) i\u0027m fast approving this.","commit_id":"4f51cdcc5c1f4f082a5fffd470d1f65b6fa65ecd"}]}