)]}'
{"/COMMIT_MSG":[{"author":{"_account_id":6873,"name":"Matt Riedemann","email":"mriedem.os@gmail.com","username":"mriedem"},"change_message_id":"2181f00b999eb5f733e8453341baf764f8233e7e","unresolved":false,"context_lines":[{"line_number":16,"context_line":"Conflicts:"},{"line_number":17,"context_line":"\tneutron/tests/api/base.py"},{"line_number":18,"context_line":"\tneutron/tests/api/test_vpnaas_extensions.py"},{"line_number":19,"context_line":""},{"line_number":20,"context_line":"Change-Id: I25267bd6713cf38f7134f4f047dc550c6f4a2a78"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":1,"id":"1a4dcd0f_460cfa40","line":19,"updated":"2015-08-05 18:53:28.000000000","message":"Closes-Bug: #1481862","commit_id":"6f5da5b5aef2683d827265a6d756a34f5023d1ac"}],"neutron/tests/api/base.py":[{"author":{"_account_id":6873,"name":"Matt Riedemann","email":"mriedem.os@gmail.com","username":"mriedem"},"change_message_id":"d946231cfb89ac959acc29101d088e1edef9a0d0","unresolved":false,"context_lines":[{"line_number":388,"context_line":"        cls.client.delete_router(router[\u0027id\u0027])"},{"line_number":389,"context_line":""},{"line_number":390,"context_line":"    @classmethod"},{"line_number":391,"context_line":"    def create_address_scope(cls, name, is_admin\u003dFalse, **kwargs):"},{"line_number":392,"context_line":"        if is_admin:"},{"line_number":393,"context_line":"            body \u003d cls.admin_client.create_address_scope(name\u003dname, **kwargs)"},{"line_number":394,"context_line":"            cls.admin_address_scopes.append(body[\u0027address_scope\u0027])"}],"source_content_type":"text/x-python","patch_set":2,"id":"1a4dcd0f_b17bb68b","line":391,"updated":"2015-08-05 18:55:33.000000000","message":"Why is this all added?","commit_id":"7fde332a8371656ef5445a8bddeb06a8919d0c95"},{"author":{"_account_id":9656,"name":"Ihar Hrachyshka","email":"ihrachys@redhat.com","username":"ihrachys","status":"Red Hat Networking Systems Engineer"},"change_message_id":"05743e7139ba323249768fdb0d5fe4dc4e61094f","unresolved":false,"context_lines":[{"line_number":388,"context_line":"        cls.client.delete_router(router[\u0027id\u0027])"},{"line_number":389,"context_line":""},{"line_number":390,"context_line":"    @classmethod"},{"line_number":391,"context_line":"    def create_address_scope(cls, name, is_admin\u003dFalse, **kwargs):"},{"line_number":392,"context_line":"        if is_admin:"},{"line_number":393,"context_line":"            body \u003d cls.admin_client.create_address_scope(name\u003dname, **kwargs)"},{"line_number":394,"context_line":"            cls.admin_address_scopes.append(body[\u0027address_scope\u0027])"}],"source_content_type":"text/x-python","patch_set":2,"id":"1a4dcd0f_9176baa2","line":391,"updated":"2015-08-05 18:55:35.000000000","message":"why do you add it here?","commit_id":"7fde332a8371656ef5445a8bddeb06a8919d0c95"},{"author":{"_account_id":6524,"name":"Henry Gessau","email":"HenryG@gessau.net","username":"gessau"},"change_message_id":"713e8fa113d689ffdc68f7380192071aa686772c","unresolved":false,"context_lines":[{"line_number":388,"context_line":"        cls.client.delete_router(router[\u0027id\u0027])"},{"line_number":389,"context_line":""},{"line_number":390,"context_line":"    @classmethod"},{"line_number":391,"context_line":"    def create_address_scope(cls, name, is_admin\u003dFalse, **kwargs):"},{"line_number":392,"context_line":"        if is_admin:"},{"line_number":393,"context_line":"            body \u003d cls.admin_client.create_address_scope(name\u003dname, **kwargs)"},{"line_number":394,"context_line":"            cls.admin_address_scopes.append(body[\u0027address_scope\u0027])"}],"source_content_type":"text/x-python","patch_set":2,"id":"1a4dcd0f_517a7278","line":391,"in_reply_to":"1a4dcd0f_9176baa2","updated":"2015-08-05 18:58:24.000000000","message":"Because I am stupid and failed to resolve the merge conflict correctly.","commit_id":"7fde332a8371656ef5445a8bddeb06a8919d0c95"}]}