)]}'
{"/COMMIT_MSG":[{"author":{"_account_id":21798,"name":"Bernard Cafarelli","email":"bcafarel@redhat.com","username":"bcafarel"},"change_message_id":"127ab9dc651c42590ded93c5e28177ac981ea32b","unresolved":true,"context_lines":[{"line_number":22,"context_line":""},{"line_number":23,"context_line":"Conflicts:"},{"line_number":24,"context_line":"    neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py"},{"line_number":25,"context_line":"    neutron/tests/functional/agent/common/test_ovs_lib.py"},{"line_number":26,"context_line":"    neutron/tests/unit/plugins/ml2/drivers/openvswitch/agent/test_ovs_neutron_agent.py"},{"line_number":27,"context_line":"    neutron/tests/unit/plugins/ml2/drivers/openvswitch/agent/test_ovs_tunnel.py"},{"line_number":28,"context_line":""}],"source_content_type":"text/x-gerrit-commit-message","patch_set":2,"id":"c4f0e087_5acde9c5","line":25,"range":{"start_line":25,"start_character":42,"end_line":25,"end_character":57},"updated":"2021-01-21 10:39:09.000000000","message":"I do not see conflicts on this file?","commit_id":"34e2061d94c74f90fba9d7c1e3ba47b227f0fe07"},{"author":{"_account_id":11975,"name":"Slawek Kaplonski","email":"skaplons@redhat.com","username":"slaweq"},"change_message_id":"fd392b054cd11b976038c1dc0754921cced24fc2","unresolved":true,"context_lines":[{"line_number":22,"context_line":""},{"line_number":23,"context_line":"Conflicts:"},{"line_number":24,"context_line":"    neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py"},{"line_number":25,"context_line":"    neutron/tests/functional/agent/common/test_ovs_lib.py"},{"line_number":26,"context_line":"    neutron/tests/unit/plugins/ml2/drivers/openvswitch/agent/test_ovs_neutron_agent.py"},{"line_number":27,"context_line":"    neutron/tests/unit/plugins/ml2/drivers/openvswitch/agent/test_ovs_tunnel.py"},{"line_number":28,"context_line":""}],"source_content_type":"text/x-gerrit-commit-message","patch_set":2,"id":"00e319f2_1e3e00b4","line":25,"range":{"start_line":25,"start_character":42,"end_line":25,"end_character":57},"in_reply_to":"c4f0e087_5acde9c5","updated":"2021-01-23 09:21:38.000000000","message":"I don\u0027t know why I added it here.","commit_id":"34e2061d94c74f90fba9d7c1e3ba47b227f0fe07"}],"neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py":[{"author":{"_account_id":21798,"name":"Bernard Cafarelli","email":"bcafarel@redhat.com","username":"bcafarel"},"change_message_id":"127ab9dc651c42590ded93c5e28177ac981ea32b","unresolved":true,"context_lines":[{"line_number":1566,"context_line":"                    phys_ofport \u003d br.add_patch_port("},{"line_number":1567,"context_line":"                        phys_if_name, constants.NONEXISTENT_PEER)"},{"line_number":1568,"context_line":""},{"line_number":1569,"context_line":"            self.int_br.set_igmp_snooping_flood("},{"line_number":1570,"context_line":"                int_if_name, self.conf.OVS.igmp_snooping_enable)"},{"line_number":1571,"context_line":"            self.int_ofports[physical_network] \u003d int_ofport"},{"line_number":1572,"context_line":"            self.phys_ofports[physical_network] \u003d phys_ofport"}],"source_content_type":"text/x-python","patch_set":2,"id":"a61b0dd5_1f82478c","line":1569,"updated":"2021-01-21 10:39:09.000000000","message":"Self note, this is not at L1563 (as would blind cherry-pick would do), to also apply just in case to the veth interconnection setups","commit_id":"34e2061d94c74f90fba9d7c1e3ba47b227f0fe07"}],"neutron/tests/unit/plugins/ml2/drivers/openvswitch/agent/test_ovs_tunnel.py":[{"author":{"_account_id":21798,"name":"Bernard Cafarelli","email":"bcafarel@redhat.com","username":"bcafarel"},"change_message_id":"127ab9dc651c42590ded93c5e28177ac981ea32b","unresolved":true,"context_lines":[{"line_number":713,"context_line":"        self.mock_int_bridge_expected +\u003d ["},{"line_number":714,"context_line":"            mock.call.db_get_val(\u0027Interface\u0027, \u0027int-%s\u0027 % self.MAP_TUN_BRIDGE,"},{"line_number":715,"context_line":"                                 \u0027type\u0027, log_errors\u003dFalse),"},{"line_number":716,"context_line":"            mock.call.add_port(\u0027int-%s\u0027 % self.MAP_TUN_BRIDGE),"},{"line_number":717,"context_line":"            mock.call.set_igmp_snooping_flood(\u0027int-%s\u0027 % self.MAP_TUN_BRIDGE,"},{"line_number":718,"context_line":"                                              igmp_snooping),"},{"line_number":719,"context_line":"        ]"}],"source_content_type":"text/x-python","patch_set":2,"id":"8ffd41cc_8f87ca99","line":716,"updated":"2021-01-21 10:39:09.000000000","message":"Extra changes for the veth interconnection case (that was removed in master), nice","commit_id":"34e2061d94c74f90fba9d7c1e3ba47b227f0fe07"}]}