)]}'
{"/COMMIT_MSG":[{"author":{"_account_id":6873,"name":"Matt Riedemann","email":"mriedem.os@gmail.com","username":"mriedem"},"change_message_id":"6a4b8f8d8380b93e1acefff4c1d648208bb4fde9","unresolved":false,"context_lines":[{"line_number":18,"context_line":"Closes-bug: #1729584"},{"line_number":19,"context_line":"Closes-bug: #1753394"},{"line_number":20,"context_line":""},{"line_number":21,"context_line":" Conflicts:"},{"line_number":22,"context_line":"\tnova/tests/unit/virt/libvirt/test_driver.py"},{"line_number":23,"context_line":""},{"line_number":24,"context_line":"NOTE(artom) Conflicts in nova/tests/unit/virt/libvirt/test_driver.py"},{"line_number":25,"context_line":"because the surrounding _get_guest_config_with_graphics method isn\u0027t"},{"line_number":26,"context_line":"present in pike."},{"line_number":27,"context_line":""},{"line_number":28,"context_line":"Change-Id: Ia91e2f9c316e25394a0f41dc341d903dfcff6921"},{"line_number":29,"context_line":"(cherry picked from commit 2616b384e642b6eb58eef7da87b6e893f25a949e)"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":2,"id":"9f6a8fd7_789ff45e","line":26,"range":{"start_line":21,"start_character":0,"end_line":26,"end_character":16},"updated":"2018-04-19 12:10:57.000000000","message":"Were there real conflicts going from pike-\u003eocata or is this just part of the pike backport? If the latter, we don\u0027t really need it in here.","commit_id":"86b7ed8efe8212bdf6fc64d6705f673737fad783"}]}