)]}'
{"/COMMIT_MSG":[{"author":{"_account_id":6873,"name":"Matt Riedemann","email":"mriedem.os@gmail.com","username":"mriedem"},"change_message_id":"2fb93c58cdb33ce5dc8f37edf8459761c46a9d14","unresolved":false,"context_lines":[{"line_number":57,"context_line":"updated accordingly."},{"line_number":58,"context_line":""},{"line_number":59,"context_line":"[1] https://developer.openstack.org/api-ref/image/v2/index.html#sharing"},{"line_number":60,"context_line":""},{"line_number":61,"context_line":"Change-Id: If53bc8fa8ab4a8a9072061af7afed53fc12c97a5"},{"line_number":62,"context_line":"Closes-Bug: #1675791"},{"line_number":63,"context_line":"(backported from commit 35cc0f5e943642dd8d9dacbf0dac6e260f708d7d)"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":3,"id":"5fc1f717_7a3c24bf","line":60,"updated":"2019-03-20 13:20:01.000000000","message":"It is generally good form when you have conflicts in a backport to (1) list the conflicts and (2) provide a note about what caused the conflict so reviewers can be aware and make sure you are not missing something. For example, here is a backport I did to stable/queens that had a conflict which I listed and documented:\n\nhttps://review.openstack.org/#/c/611945/2//COMMIT_MSG@31","commit_id":"73fb2ac0a9b5ec3b1e8cf56b671c6cafa989c7fb"}],"nova/compute/api.py":[{"author":{"_account_id":6873,"name":"Matt Riedemann","email":"mriedem.os@gmail.com","username":"mriedem"},"change_message_id":"338f9f58f58e86d2edb1822585213226c22d7821","unresolved":false,"context_lines":[{"line_number":2922,"context_line":"                                               extra_properties\u003dNone):"},{"line_number":2923,"context_line":"        \"\"\"Initialize new metadata for a snapshot of the given instance."},{"line_number":2924,"context_line":""},{"line_number":2925,"context_line":"        :param instance: nova.objects.instance.Instance object"},{"line_number":2926,"context_line":"        :param name: string for name of the snapshot"},{"line_number":2927,"context_line":"        :param extra_properties: dict of extra metadata properties to include"},{"line_number":2928,"context_line":""}],"source_content_type":"text/x-python","patch_set":9,"id":"9fb8cfa7_994e2336","line":2925,"updated":"2019-06-12 18:22:49.000000000","message":"nit: missing the context param docstring:\n\nhttps://review.opendev.org/#/c/630769/7/nova/compute/utils.py@1182","commit_id":"6ca6f6fce691863901b01d37b8f6e3eadb2bcec4"}],"nova/tests/functional/test_images.py":[{"author":{"_account_id":6873,"name":"Matt Riedemann","email":"mriedem.os@gmail.com","username":"mriedem"},"change_message_id":"5bb6c080816f3b6ed20437372fbb4b96915f19a8","unresolved":false,"context_lines":[{"line_number":10,"context_line":"#    License for the specific language governing permissions and limitations"},{"line_number":11,"context_line":"#    under the License."},{"line_number":12,"context_line":""},{"line_number":13,"context_line":"from oslo_utils.fixture import uuidsentinel as uuids"},{"line_number":14,"context_line":""},{"line_number":15,"context_line":"from nova.tests import fixtures as nova_fixtures"},{"line_number":16,"context_line":"from nova.tests.functional.api import client"}],"source_content_type":"text/x-python","patch_set":3,"id":"5fc1f717_9a6eb0c7","line":13,"updated":"2019-03-20 13:21:05.000000000","message":"This didn\u0027t exist in Rocky:\n\nhttp://logs.openstack.org/53/643853/3/check/nova-tox-functional/4415496/job-output.txt.gz#_2019-03-20_10_16_06_577145\n\nIt was in nova so you can get it from there:\n\nhttps://github.com/openstack/nova/blob/stable/rocky/nova/tests/uuidsentinel.py","commit_id":"73fb2ac0a9b5ec3b1e8cf56b671c6cafa989c7fb"}]}