)]}'
{"/COMMIT_MSG":[{"author":{"_account_id":6873,"name":"Matt Riedemann","email":"mriedem.os@gmail.com","username":"mriedem"},"change_message_id":"08de63636c5f038c957bf2af562de6c4720033a2","unresolved":false,"context_lines":[{"line_number":11,"context_line":"should handle the 400 response properly. In before, Nova doesn\u0027t"},{"line_number":12,"context_line":"seem to handle this case and end-user gets a 500 response. This"},{"line_number":13,"context_line":"commit fixed it."},{"line_number":14,"context_line":""},{"line_number":15,"context_line":"Closes-Bug: #1691274"},{"line_number":16,"context_line":"Change-Id: I58b19ef6b537d690df90e542b6af3c64773ecc87"},{"line_number":17,"context_line":"(cherry picked from commit 083bc89f99e007c400b9f89c63ac0459da910df8)"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":1,"id":"1f485f77_c3f4f2d1","line":14,"updated":"2017-11-14 17:07:32.000000000","message":"There was obviously a conflict here when you cherry-picked. When you committed the cherry pick, there should be a \"Conflicts:\" section that you can add to the commit message so it\u0027s clear to reviewers that there is a conflict. You get extra credit if you leave a note in the commit message about what the conflict was, e.g. https://review.openstack.org/#/c/519702/","commit_id":"e044335405e9649f59eb98610b31d2f161345380"}]}