)]}'
{"neutron/objects/port/extensions/allowedaddresspairs.py":[{"author":{"_account_id":6788,"name":"Rossella Sblendido","email":"rsblendido@suse.com","username":"rossella-o"},"change_message_id":"171f87bdc4b867cd875da8f76e9db4ec47b263fa","unresolved":false,"context_lines":[{"line_number":13,"context_line":"from oslo_versionedobjects import base as obj_base"},{"line_number":14,"context_line":"from oslo_versionedobjects import fields as obj_fields"},{"line_number":15,"context_line":""},{"line_number":16,"context_line":"\u003c\u003c\u003c\u003c\u003c\u003c\u003c HEAD"},{"line_number":17,"context_line":"from neutron.db.allowed_address_pairs import models"},{"line_number":18,"context_line":"\u003d\u003d\u003d\u003d\u003d\u003d\u003d"},{"line_number":19,"context_line":"from neutron.db import allowedaddresspairs_db as models"}],"source_content_type":"text/x-python","patch_set":1,"id":"5aef4532_f0324ef1","line":16,"updated":"2016-03-09 10:15:16.000000000","message":"this looks like a conflict in git :)...anyway this file shouldn\u0027t be present in this patch","commit_id":"0ce8af710092ba7752a1fea2643bc1247c28c90e"}],"neutron/objects/port/extensions/port_security.py":[{"author":{"_account_id":6788,"name":"Rossella Sblendido","email":"rsblendido@suse.com","username":"rossella-o"},"change_message_id":"171f87bdc4b867cd875da8f76e9db4ec47b263fa","unresolved":false,"context_lines":[{"line_number":25,"context_line":""},{"line_number":26,"context_line":"\tdb_model \u003d models.PortSecurityBinding"},{"line_number":27,"context_line":""},{"line_number":28,"context_line":"\tprimary_keys \u003d [\u0027port_id\u0027, \u0027port_security_enable\u0027]"},{"line_number":29,"context_line":""},{"line_number":30,"context_line":"\tfields_no_updated \u003d [\u0027port_id\u0027]"},{"line_number":31,"context_line":"\t"}],"source_content_type":"text/x-python","patch_set":1,"id":"5aef4532_10c1ba54","line":28,"updated":"2016-03-09 10:15:16.000000000","message":"\u0027port_security_enable\u0027 is not a key","commit_id":"0ce8af710092ba7752a1fea2643bc1247c28c90e"},{"author":{"_account_id":6788,"name":"Rossella Sblendido","email":"rsblendido@suse.com","username":"rossella-o"},"change_message_id":"171f87bdc4b867cd875da8f76e9db4ec47b263fa","unresolved":false,"context_lines":[{"line_number":28,"context_line":"\tprimary_keys \u003d [\u0027port_id\u0027, \u0027port_security_enable\u0027]"},{"line_number":29,"context_line":""},{"line_number":30,"context_line":"\tfields_no_updated \u003d [\u0027port_id\u0027]"},{"line_number":31,"context_line":"\t"},{"line_number":32,"context_line":"\tfields \u003d {"},{"line_number":33,"context_line":"\t\t\u0027port_id\u0027: obj_fields.UUIDField(),"},{"line_number":34,"context_line":"\t\t\u0027port_security_enable\u0027: obj_fields.BooleanField(),"}],"source_content_type":"text/x-python","patch_set":1,"id":"5aef4532_302e7643","line":31,"updated":"2016-03-09 10:15:16.000000000","message":"fix indentation please :) we uses spaces","commit_id":"0ce8af710092ba7752a1fea2643bc1247c28c90e"}],"neutron/tests/unit/objects/port/extensions/test_allowedaddresspairs.py":[{"author":{"_account_id":6788,"name":"Rossella Sblendido","email":"rsblendido@suse.com","username":"rossella-o"},"change_message_id":"171f87bdc4b867cd875da8f76e9db4ec47b263fa","unresolved":false,"context_lines":[{"line_number":9,"context_line":"#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the"},{"line_number":10,"context_line":"#    License for the specific language governing permissions and limitations"},{"line_number":11,"context_line":"#    under the License."},{"line_number":12,"context_line":"\u003c\u003c\u003c\u003c\u003c\u003c\u003c HEAD"},{"line_number":13,"context_line":"import mock"},{"line_number":14,"context_line":""},{"line_number":15,"context_line":"from neutron import context"}],"source_content_type":"text/x-python","patch_set":1,"id":"5aef4532_30a316b4","line":12,"updated":"2016-03-09 10:15:16.000000000","message":"fix conflicts and this file should not be included in this patch anyway :)","commit_id":"0ce8af710092ba7752a1fea2643bc1247c28c90e"}],"neutron/tests/unit/objects/test_objects.py":[{"author":{"_account_id":6788,"name":"Rossella Sblendido","email":"rsblendido@suse.com","username":"rossella-o"},"change_message_id":"171f87bdc4b867cd875da8f76e9db4ec47b263fa","unresolved":false,"context_lines":[{"line_number":27,"context_line":"    \u0027QosBandwidthLimitRule\u0027: \u00271.0-4e44a8f5c2895ab1278399f87b40a13d\u0027,"},{"line_number":28,"context_line":"    \u0027QosRuleType\u0027: \u00271.0-d0df298d49eeffab91af18d1a4cf7eaf\u0027,"},{"line_number":29,"context_line":"    \u0027QosPolicy\u0027: \u00271.0-721fa60ea8f0e8f15d456d6e917dfe59\u0027,"},{"line_number":30,"context_line":"    \u0027AllowedAddressPair\u0027: \u00271.0-66b907b552885e572a364c79e4b24c05\u0027"},{"line_number":31,"context_line":"}"},{"line_number":32,"context_line":""},{"line_number":33,"context_line":""}],"source_content_type":"text/x-python","patch_set":1,"id":"5aef4532_f09d2e67","line":30,"updated":"2016-03-09 10:15:16.000000000","message":"this change doesn\u0027t belong here, you should add the class that you are introducing PortSecurity","commit_id":"0ce8af710092ba7752a1fea2643bc1247c28c90e"}]}