)]}'
{"/COMMIT_MSG":[{"author":{"_account_id":17685,"name":"Elod Illes","email":"elod.illes@est.tech","username":"elod.illes"},"change_message_id":"7f5adc36ad03b2d96952f0f80707a3a074d69a2c","unresolved":true,"context_lines":[{"line_number":12,"context_line":""},{"line_number":13,"context_line":"Conflicts:"},{"line_number":14,"context_line":"\tnova/api/validation/extra_specs/hw.py"},{"line_number":15,"context_line":"\tnova/api/validation/extra_specs/null.py"},{"line_number":16,"context_line":"\tnova/tests/unit/api/openstack/compute/test_flavors_extra_specs.py"},{"line_number":17,"context_line":""},{"line_number":18,"context_line":"Change-Id: I9d8d8c3a30cf6da7e8fb48374347e069ab075df2"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":3,"id":"75d71ab9_2809bcc5","line":15,"updated":"2021-02-03 14:06:47.000000000","message":"The above files do not exist in stable/train due to extra specs validators (patch Ib64a1348cce1dca995746214616c4f33d9d664bd) was introduced in Ussuri.","commit_id":"224fb5f76d6f93ad0afc4a3db74f8d5e60060a26"},{"author":{"_account_id":17685,"name":"Elod Illes","email":"elod.illes@est.tech","username":"elod.illes"},"change_message_id":"7f5adc36ad03b2d96952f0f80707a3a074d69a2c","unresolved":true,"context_lines":[{"line_number":13,"context_line":"Conflicts:"},{"line_number":14,"context_line":"\tnova/api/validation/extra_specs/hw.py"},{"line_number":15,"context_line":"\tnova/api/validation/extra_specs/null.py"},{"line_number":16,"context_line":"\tnova/tests/unit/api/openstack/compute/test_flavors_extra_specs.py"},{"line_number":17,"context_line":""},{"line_number":18,"context_line":"Change-Id: I9d8d8c3a30cf6da7e8fb48374347e069ab075df2"},{"line_number":19,"context_line":"Closes-Bug: 1841932"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":3,"id":"f1e41aee_9ee62aef","line":16,"updated":"2021-02-03 14:06:47.000000000","message":"This file has conflict due to the same bp/flavor-extra-sepc-validators feature (specifically this patch probably: I8da84b48e4d630eeb91d92346aa2323e25e28e3b) - added in Ussuri.","commit_id":"224fb5f76d6f93ad0afc4a3db74f8d5e60060a26"},{"author":{"_account_id":17685,"name":"Elod Illes","email":"elod.illes@est.tech","username":"elod.illes"},"change_message_id":"7f5adc36ad03b2d96952f0f80707a3a074d69a2c","unresolved":true,"context_lines":[{"line_number":17,"context_line":""},{"line_number":18,"context_line":"Change-Id: I9d8d8c3a30cf6da7e8fb48374347e069ab075df2"},{"line_number":19,"context_line":"Closes-Bug: 1841932"},{"line_number":20,"context_line":"(cherry picked from commit bf488a8630702160021b5848bf6e86fbb8015205)"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":3,"id":"4cd512cf_18432728","line":20,"updated":"2021-02-03 14:06:47.000000000","message":"should be:\n\nChange-Id: I9d8d8c3a30cf6da7e8fb48374347e069ab075df2\nCloses-Bug: 1841932\n(cherry picked from commit bf488a8630702160021b5848bf6e86fbb8015205)\n(cherry picked from commit 9d28d7ec808469ec129b66c69b9e63cd9537a63f)\n\n\nplease always use \u0027git cherry-pick -x\u0027 and always cherry pick from the N+1 branch to branch N, so that all the \u0027cherry picked from\u0027 lines are added (for traceability). See \u0027conflicting files\u0027 related section at https://docs.openstack.org/project-team-guide/stable-branches.html#conflicts","commit_id":"224fb5f76d6f93ad0afc4a3db74f8d5e60060a26"}]}