)]}'
{"/COMMIT_MSG":[{"author":{"_account_id":6873,"name":"Matt Riedemann","email":"mriedem.os@gmail.com","username":"mriedem"},"change_message_id":"c7a7579bfcd0526ba33924a057ae6aeb56245883","unresolved":false,"context_lines":[{"line_number":19,"context_line":""},{"line_number":20,"context_line":"Closes-Bug: #1784093"},{"line_number":21,"context_line":""},{"line_number":22,"context_line":" Conflicts:"},{"line_number":23,"context_line":"\tnova/tests/unit/compute/test_compute_api.py"},{"line_number":24,"context_line":""},{"line_number":25,"context_line":"Change-Id: If897a0d721180152ebdceb7a0c23e8f283ce6d10"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":2,"id":"ffb9cba7_80532317","line":22,"updated":"2019-04-30 13:19:43.000000000","message":"Was there actually a conflict or was this just pulled in because it was in the stable/rocky version? If the latter, we could just remove it to avoid confusion.","commit_id":"2d9457236af8d85aee2644ef1a9d040f352ef6c2"},{"author":{"_account_id":6873,"name":"Matt Riedemann","email":"mriedem.os@gmail.com","username":"mriedem"},"change_message_id":"deecc303b1fd1fadb09aac1e57d9a01312d44254","unresolved":false,"context_lines":[{"line_number":19,"context_line":""},{"line_number":20,"context_line":"Closes-Bug: #1784093"},{"line_number":21,"context_line":""},{"line_number":22,"context_line":" Conflicts:"},{"line_number":23,"context_line":"\tnova/tests/unit/compute/test_compute_api.py"},{"line_number":24,"context_line":""},{"line_number":25,"context_line":"Change-Id: If897a0d721180152ebdceb7a0c23e8f283ce6d10"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":2,"id":"ffb9cba7_a047474c","line":22,"in_reply_to":"ffb9cba7_80532317","updated":"2019-04-30 13:20:46.000000000","message":"OK I guess there was a conflict, I tried re-doing the cherry pick.","commit_id":"2d9457236af8d85aee2644ef1a9d040f352ef6c2"},{"author":{"_account_id":4690,"name":"melanie witt","display_name":"melwitt","email":"melwittt@gmail.com","username":"melwitt"},"change_message_id":"36dc80fc7913ca9aa2a91c575b6c67e7b919e8fa","unresolved":false,"context_lines":[{"line_number":19,"context_line":""},{"line_number":20,"context_line":"Closes-Bug: #1784093"},{"line_number":21,"context_line":""},{"line_number":22,"context_line":" Conflicts:"},{"line_number":23,"context_line":"\tnova/tests/unit/compute/test_compute_api.py"},{"line_number":24,"context_line":""},{"line_number":25,"context_line":"Change-Id: If897a0d721180152ebdceb7a0c23e8f283ce6d10"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":2,"id":"ffb9cba7_d33c97c9","line":22,"in_reply_to":"ffb9cba7_a047474c","updated":"2019-04-30 14:21:50.000000000","message":"Hm, there shouldn\u0027t be a conflict -- this was accidentally leftover from when I deleted the NOTE about the conflict from rocky. I just tried cherry-picking from rocky again and got no conflict.","commit_id":"2d9457236af8d85aee2644ef1a9d040f352ef6c2"}],"nova/tests/functional/db/test_compute_api.py":[{"author":{"_account_id":1004,"name":"Mohammed Naser","email":"mnaser@vexxhost.com","username":"mnaser"},"change_message_id":"e52330cee400c9afed72d37d157bf704c76e781f","unresolved":false,"context_lines":[{"line_number":11,"context_line":"#    under the License."},{"line_number":12,"context_line":""},{"line_number":13,"context_line":"import mock"},{"line_number":14,"context_line":"from oslo_utils.fixture import uuidsentinel as uuids"},{"line_number":15,"context_line":""},{"line_number":16,"context_line":"from nova.compute import api as compute_api"},{"line_number":17,"context_line":"from nova import context as nova_context"}],"source_content_type":"text/x-python","patch_set":1,"id":"ffb9cba7_692961e4","line":14,"range":{"start_line":14,"start_character":0,"end_line":14,"end_character":52},"updated":"2019-04-27 08:47:11.000000000","message":"Looks like this doesn\u0027t exist in this release.. not sure how we\u0027d address this.","commit_id":"c97f9a8f736e1d7d19d71b84ea475f072d48766e"}]}