)]}'
{"neutron/objects/network_segment_range.py":[{"author":{"_account_id":21798,"name":"Bernard Cafarelli","email":"bcafarel@redhat.com","username":"bcafarel"},"change_message_id":"834322312efae9d029af6656bdfbdb71d1a785ad","unresolved":false,"context_lines":[{"line_number":19,"context_line":"from neutron_lib.db import utils as db_utils"},{"line_number":20,"context_line":"from neutron_lib import exceptions as n_exc"},{"line_number":21,"context_line":"from oslo_versionedobjects import fields as obj_fields"},{"line_number":22,"context_line":"from six.moves import range as six_range"},{"line_number":23,"context_line":"from sqlalchemy import and_"},{"line_number":24,"context_line":"from sqlalchemy import not_"},{"line_number":25,"context_line":"from sqlalchemy import or_"}],"source_content_type":"text/x-python","patch_set":5,"id":"1fa4df85_777df36c","line":22,"range":{"start_line":22,"start_character":0,"end_line":22,"end_character":40},"updated":"2020-03-16 14:06:41.000000000","message":"So that file should be listed in conflicts (or similar section to point changes to clean cherry-pick)","commit_id":"72936ffcbae7f4d508f62b5fbad6ff1a1e06fe86"},{"author":{"_account_id":16688,"name":"Rodolfo Alonso","email":"ralonsoh@redhat.com","username":"rodolfo-alonso-hernandez"},"change_message_id":"f83a3e6f4059f5fa9a29fa3c5466d4c88fde97e5","unresolved":false,"context_lines":[{"line_number":19,"context_line":"from neutron_lib.db import utils as db_utils"},{"line_number":20,"context_line":"from neutron_lib import exceptions as n_exc"},{"line_number":21,"context_line":"from oslo_versionedobjects import fields as obj_fields"},{"line_number":22,"context_line":"from six.moves import range as six_range"},{"line_number":23,"context_line":"from sqlalchemy import and_"},{"line_number":24,"context_line":"from sqlalchemy import not_"},{"line_number":25,"context_line":"from sqlalchemy import or_"}],"source_content_type":"text/x-python","patch_set":5,"id":"1fa4df85_6d8204cb","line":22,"range":{"start_line":22,"start_character":0,"end_line":22,"end_character":40},"in_reply_to":"1fa4df85_777df36c","updated":"2020-03-16 16:18:45.000000000","message":"Done","commit_id":"72936ffcbae7f4d508f62b5fbad6ff1a1e06fe86"}],"neutron/objects/plugins/ml2/base.py":[{"author":{"_account_id":21798,"name":"Bernard Cafarelli","email":"bcafarel@redhat.com","username":"bcafarel"},"change_message_id":"834322312efae9d029af6656bdfbdb71d1a785ad","unresolved":false,"context_lines":[{"line_number":15,"context_line":"import abc"},{"line_number":16,"context_line":""},{"line_number":17,"context_line":"import netaddr"},{"line_number":18,"context_line":"import six"},{"line_number":19,"context_line":""},{"line_number":20,"context_line":"from neutron.common import _constants as common_constants"},{"line_number":21,"context_line":"from neutron.objects import base"}],"source_content_type":"text/x-python","patch_set":5,"id":"1fa4df85_579237a1","line":18,"range":{"start_line":18,"start_character":0,"end_line":18,"end_character":10},"updated":"2020-03-16 14:06:41.000000000","message":"same for here (import and decorator at L43)","commit_id":"72936ffcbae7f4d508f62b5fbad6ff1a1e06fe86"},{"author":{"_account_id":16688,"name":"Rodolfo Alonso","email":"ralonsoh@redhat.com","username":"rodolfo-alonso-hernandez"},"change_message_id":"f83a3e6f4059f5fa9a29fa3c5466d4c88fde97e5","unresolved":false,"context_lines":[{"line_number":15,"context_line":"import abc"},{"line_number":16,"context_line":""},{"line_number":17,"context_line":"import netaddr"},{"line_number":18,"context_line":"import six"},{"line_number":19,"context_line":""},{"line_number":20,"context_line":"from neutron.common import _constants as common_constants"},{"line_number":21,"context_line":"from neutron.objects import base"}],"source_content_type":"text/x-python","patch_set":5,"id":"1fa4df85_2d6c0c35","line":18,"range":{"start_line":18,"start_character":0,"end_line":18,"end_character":10},"in_reply_to":"1fa4df85_579237a1","updated":"2020-03-16 16:18:45.000000000","message":"Done","commit_id":"72936ffcbae7f4d508f62b5fbad6ff1a1e06fe86"}],"neutron/objects/plugins/ml2/vlanallocation.py":[{"author":{"_account_id":21798,"name":"Bernard Cafarelli","email":"bcafarel@redhat.com","username":"bcafarel"},"change_message_id":"834322312efae9d029af6656bdfbdb71d1a785ad","unresolved":false,"context_lines":[{"line_number":38,"context_line":""},{"line_number":39,"context_line":"    network_type \u003d n_const.TYPE_VLAN"},{"line_number":40,"context_line":""},{"line_number":41,"context_line":"    @staticmethod"},{"line_number":42,"context_line":"    def get_physical_networks(context):"},{"line_number":43,"context_line":"        query \u003d context.session.query(VlanAllocation.db_model.physical_network)"},{"line_number":44,"context_line":"        query \u003d query.group_by(VlanAllocation.db_model.physical_network)"}],"source_content_type":"text/x-python","patch_set":5,"id":"1fa4df85_17459f43","line":41,"updated":"2020-03-16 14:06:41.000000000","message":"This whole block comes from I8568e2277e157754aaff87a059a40e34e6a43e2b which looks like backportable? If possible, I would prefer both backports","commit_id":"72936ffcbae7f4d508f62b5fbad6ff1a1e06fe86"},{"author":{"_account_id":16688,"name":"Rodolfo Alonso","email":"ralonsoh@redhat.com","username":"rodolfo-alonso-hernandez"},"change_message_id":"f83a3e6f4059f5fa9a29fa3c5466d4c88fde97e5","unresolved":false,"context_lines":[{"line_number":38,"context_line":""},{"line_number":39,"context_line":"    network_type \u003d n_const.TYPE_VLAN"},{"line_number":40,"context_line":""},{"line_number":41,"context_line":"    @staticmethod"},{"line_number":42,"context_line":"    def get_physical_networks(context):"},{"line_number":43,"context_line":"        query \u003d context.session.query(VlanAllocation.db_model.physical_network)"},{"line_number":44,"context_line":"        query \u003d query.group_by(VlanAllocation.db_model.physical_network)"}],"source_content_type":"text/x-python","patch_set":5,"id":"1fa4df85_ad623c15","line":41,"in_reply_to":"1fa4df85_17459f43","updated":"2020-03-16 16:18:45.000000000","message":"You are right, my fault.\n\nhttps://review.opendev.org/#/c/713281/","commit_id":"72936ffcbae7f4d508f62b5fbad6ff1a1e06fe86"}]}