)]}'
{"/COMMIT_MSG":[{"author":{"_account_id":6873,"name":"Matt Riedemann","email":"mriedem.os@gmail.com","username":"mriedem"},"change_message_id":"320e46df7b936c0058f2cdbe37ddd5c3fde4c79b","unresolved":false,"context_lines":[{"line_number":11,"context_line":"service starts up again and looks for evacuations with status \u0027accepted\u0027,"},{"line_number":12,"context_line":"as it then removes the local instances for those evacuations even though"},{"line_number":13,"context_line":"the instance was never actually evacuated to another host."},{"line_number":14,"context_line":""},{"line_number":15,"context_line":"Change-Id: I06d78c744fa75ae5f34c5cfa76bc3c9460767b84"},{"line_number":16,"context_line":"Closes-Bug: #1713783"},{"line_number":17,"context_line":"(cherry picked from commit a8ebf5f1aac080854704e27146e8c98b053c6224)"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":3,"id":"9f6a8fd7_bc4b8e85","line":14,"updated":"2018-04-16 20:08:59.000000000","message":"Clearly there are conflicts in the conductor manager module, my guess would be related to these changes:\n\nI6590f0eda4ec4996543ad40d8c2640b83fc3dd9d\n\nI0c8ce65016287de7be921c312493667a8c7f762e\n\n(which is https://review.openstack.org/#/c/516404/ )\n\nI34b1d99a9d0d2aca80f094a79ec1656abaf762dc\n\nThe first and third don\u0027t apply to ocata but we might want to rebase on https://review.openstack.org/#/c/516404/ to shore up that conflict?","commit_id":"d5e5275da6550b9ef84043c188d52f508e7d0f97"}]}