)]}'
{"/COMMIT_MSG":[{"author":{"_account_id":4690,"name":"melanie witt","display_name":"melwitt","email":"melwittt@gmail.com","username":"melwitt"},"change_message_id":"657adeff460d8982ff8d150e45bb2342b319965c","unresolved":false,"context_lines":[{"line_number":16,"context_line":"cells but only the ones for this project."},{"line_number":17,"context_line":""},{"line_number":18,"context_line":"Conflicts:"},{"line_number":19,"context_line":" - Added test mock import missing in stein"},{"line_number":20,"context_line":""},{"line_number":21,"context_line":"Closes-Bug: #1878979"},{"line_number":22,"context_line":"Change-Id: I2e0d48e799e70d550f912ad8a424c86df3ade3a2"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":3,"id":"ff570b3c_5d86afdd","line":19,"updated":"2020-05-21 21:42:04.000000000","message":"My eyes! No reference of the change that caused the conflict","commit_id":"fecd96dc88929ff6d9d847cd36d2b061967fb8a1"},{"author":{"_account_id":4690,"name":"melanie witt","display_name":"melwitt","email":"melwittt@gmail.com","username":"melwitt"},"change_message_id":"aecf34cd144e1eb4d85ac2da817e4367f0ee8d6e","unresolved":false,"context_lines":[{"line_number":16,"context_line":"cells but only the ones for this project."},{"line_number":17,"context_line":""},{"line_number":18,"context_line":"Conflicts:"},{"line_number":19,"context_line":" - Added test mock import missing in stein"},{"line_number":20,"context_line":""},{"line_number":21,"context_line":"Closes-Bug: #1878979"},{"line_number":22,"context_line":"Change-Id: I2e0d48e799e70d550f912ad8a424c86df3ade3a2"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":3,"id":"ff570b3c_3dc5bb0b","line":19,"in_reply_to":"ff570b3c_5d86afdd","updated":"2020-05-21 21:45:01.000000000","message":"Hm, this also isn\u0027t a clean pick from train and the conflicting file name should be here too. I\u0027ll fix.","commit_id":"fecd96dc88929ff6d9d847cd36d2b061967fb8a1"}],"nova/tests/functional/db/test_quota.py":[{"author":{"_account_id":22348,"name":"Zuul","username":"zuul","tags":["SERVICE_USER"]},"tag":"autogenerated:zuul:check","change_message_id":"91ad0dff4d9ffa8ab1b5be8828456976dd65a96a","unresolved":false,"context_lines":[{"line_number":78,"context_line":""},{"line_number":79,"context_line":"        self.assertEqual(2, count[\u0027user\u0027][\u0027server_group_members\u0027])"},{"line_number":80,"context_line":""},{"line_number":81,"context_line":"    @mock.patch(\u0027nova.objects.CellMappingList.get_by_project_id\u0027,"},{"line_number":82,"context_line":"        wraps\u003dobjects.CellMappingList.get_by_project_id)"},{"line_number":83,"context_line":"    def test_instances_cores_ram_count(self, mock_get_project_cell_mappings):"},{"line_number":84,"context_line":"        ctxt \u003d context.RequestContext(\u0027fake-user\u0027, \u0027fake-project\u0027)"}],"source_content_type":"text/x-python","patch_set":1,"id":"ff570b3c_83f1526e","line":81,"updated":"2020-05-19 04:39:26.000000000","message":"pep8: F821 undefined name \u0027mock\u0027","commit_id":"e2c00b252c251ea91ab1b1c08533452907cd3720"}]}