)]}'
{"/COMMIT_MSG":[{"author":{"_account_id":17685,"name":"Elod Illes","email":"elod.illes@est.tech","username":"elod.illes"},"change_message_id":"741f63ac80852f2289e0ffcb8a006d4cf30ef9d1","unresolved":true,"context_lines":[{"line_number":25,"context_line":""},{"line_number":26,"context_line":"Conflicts:"},{"line_number":27,"context_line":"* vif_plug_ovs/ovs.py"},{"line_number":28,"context_line":"* vif_plug_ovs/tests/functional/test_plugin.py"},{"line_number":29,"context_line":""},{"line_number":30,"context_line":"Related-Bug: #2095152"},{"line_number":31,"context_line":"Change-Id: I6951c1bfb5a85b1f422a5f9a99b6ade17f897c6f"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":1,"id":"66b5c6c4_91fe4f0c","line":28,"updated":"2025-06-17 16:02:18.000000000","message":"conflict is because bugfix (Do not add taps in trunk bridges to the dead vlan) [1] is only present in stable/2025.1. Is there a reason not to backport that as well?\n\n[1] https://review.opendev.org/c/openstack/os-vif/+/923036","commit_id":"89aa482fe1c7049aa9a36a79582b4e2237152961"},{"author":{"_account_id":17685,"name":"Elod Illes","email":"elod.illes@est.tech","username":"elod.illes"},"change_message_id":"8a8ea2cbb055386a4efc8683ce35ad43c824797b","unresolved":false,"context_lines":[{"line_number":25,"context_line":""},{"line_number":26,"context_line":"Conflicts:"},{"line_number":27,"context_line":"* vif_plug_ovs/ovs.py"},{"line_number":28,"context_line":"* vif_plug_ovs/tests/functional/test_plugin.py"},{"line_number":29,"context_line":""},{"line_number":30,"context_line":"Related-Bug: #2095152"},{"line_number":31,"context_line":"Change-Id: I6951c1bfb5a85b1f422a5f9a99b6ade17f897c6f"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":1,"id":"2ed90c07_2a4b0872","line":28,"in_reply_to":"2edeeeb2_ee4b8838","updated":"2025-06-18 13:30:03.000000000","message":"thanks for backporting that too, now this is also a clean cherry pick \\o/\nThis was backported \u0026\u0026 merged to stable/2025.1, should be good to go here on stable/2024.2 as well. LGTM.","commit_id":"89aa482fe1c7049aa9a36a79582b4e2237152961"},{"author":{"_account_id":8313,"name":"Lajos Katona","display_name":"lajoskatona","email":"katonalala@gmail.com","username":"elajkat","status":"Ericsson Software Technology"},"change_message_id":"400c08057674ad9090c8fdd204c1178c07aa83e6","unresolved":true,"context_lines":[{"line_number":25,"context_line":""},{"line_number":26,"context_line":"Conflicts:"},{"line_number":27,"context_line":"* vif_plug_ovs/ovs.py"},{"line_number":28,"context_line":"* vif_plug_ovs/tests/functional/test_plugin.py"},{"line_number":29,"context_line":""},{"line_number":30,"context_line":"Related-Bug: #2095152"},{"line_number":31,"context_line":"Change-Id: I6951c1bfb5a85b1f422a5f9a99b6ade17f897c6f"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":1,"id":"2edeeeb2_ee4b8838","line":28,"in_reply_to":"66b5c6c4_91fe4f0c","updated":"2025-06-18 10:27:55.000000000","message":"thanks, let\u0027s try to backport that one as well","commit_id":"89aa482fe1c7049aa9a36a79582b4e2237152961"},{"author":{"_account_id":11604,"name":"sean mooney","email":"smooney@redhat.com","username":"sean-k-mooney"},"change_message_id":"96aae08228929b0a038338ede3a9ba57af129666","unresolved":true,"context_lines":[{"line_number":21,"context_line":""},{"line_number":22,"context_line":"[1]: https://review.opendev.org/c/openstack/os-vif/+/841499"},{"line_number":23,"context_line":"[2]: https://review.opendev.org/c/openstack/neutron/+/837780"},{"line_number":24,"context_line":"[3]: https://review.opendev.org/c/openstack/neutron/+/949569"},{"line_number":25,"context_line":""},{"line_number":26,"context_line":"Related-Bug: #2095152"},{"line_number":27,"context_line":"Change-Id: I6951c1bfb5a85b1f422a5f9a99b6ade17f897c6f"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":2,"id":"540a3fdb_7e5bdc4c","line":24,"updated":"2025-08-14 17:11:07.000000000","message":"ah yes the neturon part is called out in this patch.","commit_id":"a19f532ab171ff342f26f7af94befc796d069738"},{"author":{"_account_id":8313,"name":"Lajos Katona","display_name":"lajoskatona","email":"katonalala@gmail.com","username":"elajkat","status":"Ericsson Software Technology"},"change_message_id":"e14fc492d7cd472bb06f5950361366e29272caa3","unresolved":true,"context_lines":[{"line_number":21,"context_line":""},{"line_number":22,"context_line":"[1]: https://review.opendev.org/c/openstack/os-vif/+/841499"},{"line_number":23,"context_line":"[2]: https://review.opendev.org/c/openstack/neutron/+/837780"},{"line_number":24,"context_line":"[3]: https://review.opendev.org/c/openstack/neutron/+/949569"},{"line_number":25,"context_line":""},{"line_number":26,"context_line":"Related-Bug: #2095152"},{"line_number":27,"context_line":"Change-Id: I6951c1bfb5a85b1f422a5f9a99b6ade17f897c6f"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":2,"id":"f6baa6a3_46d5c4c1","line":24,"in_reply_to":"540a3fdb_7e5bdc4c","updated":"2025-08-15 09:31:31.000000000","message":"yes the original Neutron patch was merged in 2023.1 as I see","commit_id":"a19f532ab171ff342f26f7af94befc796d069738"}]}