)]}'
{"/COMMIT_MSG":[{"author":{"_account_id":17685,"name":"Elod Illes","email":"elod.illes@est.tech","username":"elod.illes"},"change_message_id":"e3aacc59d090172dca6d94bc3303eeb01380bae8","unresolved":false,"context_lines":[{"line_number":26,"context_line":"(cherry picked from commit 5018727f8e18992e64c55b84f0d5b39ae7c70b32)"},{"line_number":27,"context_line":""},{"line_number":28,"context_line":"Conflicts:"},{"line_number":29,"context_line":"\tcinder/tests/unit/backup/drivers/test_backup_ceph.py"},{"line_number":30,"context_line":"Change-Id: I516b7c82b05b26e81195f7f106d43a9e0804082d"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":1,"id":"3fa7e38b_a6ffc267","line":29,"range":{"start_line":29,"start_character":1,"end_line":29,"end_character":53},"updated":"2020-02-04 15:58:55.000000000","message":"Note: this conflict is due to not having formatting patch Ia06940cff7c3b71938eddb271d2cb8170e02e954 in Stein.","commit_id":"6cc8adb132b91be68c0b22c750417efb97f08ce0"}],"cinder/tests/unit/backup/drivers/test_backup_ceph.py":[{"author":{"_account_id":17685,"name":"Elod Illes","email":"elod.illes@est.tech","username":"elod.illes"},"change_message_id":"e3aacc59d090172dca6d94bc3303eeb01380bae8","unresolved":false,"context_lines":[{"line_number":840,"context_line":"                    mock_get_backup_base_name.return_value \u003d base_name"},{"line_number":841,"context_line":"                    mock_get_new_snap_name.return_value \u003d \u0027new_snap\u0027"},{"line_number":842,"context_line":"                    image \u003d self.service.rbd.Image()"},{"line_number":843,"context_line":"                    meta \u003d linuxrbd.RBDImageMetadata(image,"},{"line_number":844,"context_line":"                                                     \u0027pool_foo\u0027,"},{"line_number":845,"context_line":"                                                     \u0027user_foo\u0027,"},{"line_number":846,"context_line":"                                                     \u0027conf_foo\u0027)"},{"line_number":847,"context_line":"                    rbdio \u003d linuxrbd.RBDVolumeIOWrapper(meta)"},{"line_number":848,"context_line":"                    rbdio.seek(0)"},{"line_number":849,"context_line":"                    self.service._backup_rbd(self.alt_backup, rbdio, vol_name,"}],"source_content_type":"text/x-python","patch_set":1,"id":"3fa7e38b_2677523f","line":846,"range":{"start_line":843,"start_character":0,"end_line":846,"end_character":64},"updated":"2020-02-04 15:58:55.000000000","message":"original patch had the following formatting here:\n\nmeta \u003d linuxrbd.RBDImageMetadata(image, \u0027pool_foo\u0027,\n                                 \u0027user_foo\u0027, \u0027conf_foo\u0027)","commit_id":"6cc8adb132b91be68c0b22c750417efb97f08ce0"},{"author":{"_account_id":8846,"name":"Hao Wang","display_name":"Hao Wang","email":"sxmatch1986@gmail.com","username":"sxmatch"},"change_message_id":"5cd12cedea439af32e143b41d8f6a532cafab5f3","unresolved":false,"context_lines":[{"line_number":840,"context_line":"                    mock_get_backup_base_name.return_value \u003d base_name"},{"line_number":841,"context_line":"                    mock_get_new_snap_name.return_value \u003d \u0027new_snap\u0027"},{"line_number":842,"context_line":"                    image \u003d self.service.rbd.Image()"},{"line_number":843,"context_line":"                    meta \u003d linuxrbd.RBDImageMetadata(image,"},{"line_number":844,"context_line":"                                                     \u0027pool_foo\u0027,"},{"line_number":845,"context_line":"                                                     \u0027user_foo\u0027,"},{"line_number":846,"context_line":"                                                     \u0027conf_foo\u0027)"},{"line_number":847,"context_line":"                    rbdio \u003d linuxrbd.RBDVolumeIOWrapper(meta)"},{"line_number":848,"context_line":"                    rbdio.seek(0)"},{"line_number":849,"context_line":"                    self.service._backup_rbd(self.alt_backup, rbdio, vol_name,"}],"source_content_type":"text/x-python","patch_set":1,"id":"3fa7e38b_ec631117","line":846,"range":{"start_line":843,"start_character":0,"end_line":846,"end_character":64},"in_reply_to":"3fa7e38b_17dd666d","updated":"2020-02-10 02:29:59.000000000","message":"Got it, thanks Elod","commit_id":"6cc8adb132b91be68c0b22c750417efb97f08ce0"},{"author":{"_account_id":10459,"name":"Luigi Toscano","email":"ltoscano@redhat.com","username":"ltoscano"},"change_message_id":"0324b0e96a67f0f58a0e5b6f33bbfe6899065202","unresolved":false,"context_lines":[{"line_number":840,"context_line":"                    mock_get_backup_base_name.return_value \u003d base_name"},{"line_number":841,"context_line":"                    mock_get_new_snap_name.return_value \u003d \u0027new_snap\u0027"},{"line_number":842,"context_line":"                    image \u003d self.service.rbd.Image()"},{"line_number":843,"context_line":"                    meta \u003d linuxrbd.RBDImageMetadata(image,"},{"line_number":844,"context_line":"                                                     \u0027pool_foo\u0027,"},{"line_number":845,"context_line":"                                                     \u0027user_foo\u0027,"},{"line_number":846,"context_line":"                                                     \u0027conf_foo\u0027)"},{"line_number":847,"context_line":"                    rbdio \u003d linuxrbd.RBDVolumeIOWrapper(meta)"},{"line_number":848,"context_line":"                    rbdio.seek(0)"},{"line_number":849,"context_line":"                    self.service._backup_rbd(self.alt_backup, rbdio, vol_name,"}],"source_content_type":"text/x-python","patch_set":1,"id":"3fa7e38b_77de1a3d","line":846,"range":{"start_line":843,"start_character":0,"end_line":846,"end_character":64},"in_reply_to":"3fa7e38b_17dd666d","updated":"2020-02-07 14:45:07.000000000","message":"Uh, you are totally right, sorry. I checked the wrong snippet.","commit_id":"6cc8adb132b91be68c0b22c750417efb97f08ce0"},{"author":{"_account_id":8846,"name":"Hao Wang","display_name":"Hao Wang","email":"sxmatch1986@gmail.com","username":"sxmatch"},"change_message_id":"0de1adaca67a7290158875e85db77e87ac3305e0","unresolved":false,"context_lines":[{"line_number":840,"context_line":"                    mock_get_backup_base_name.return_value \u003d base_name"},{"line_number":841,"context_line":"                    mock_get_new_snap_name.return_value \u003d \u0027new_snap\u0027"},{"line_number":842,"context_line":"                    image \u003d self.service.rbd.Image()"},{"line_number":843,"context_line":"                    meta \u003d linuxrbd.RBDImageMetadata(image,"},{"line_number":844,"context_line":"                                                     \u0027pool_foo\u0027,"},{"line_number":845,"context_line":"                                                     \u0027user_foo\u0027,"},{"line_number":846,"context_line":"                                                     \u0027conf_foo\u0027)"},{"line_number":847,"context_line":"                    rbdio \u003d linuxrbd.RBDVolumeIOWrapper(meta)"},{"line_number":848,"context_line":"                    rbdio.seek(0)"},{"line_number":849,"context_line":"                    self.service._backup_rbd(self.alt_backup, rbdio, vol_name,"}],"source_content_type":"text/x-python","patch_set":1,"id":"3fa7e38b_78b877e6","line":846,"range":{"start_line":843,"start_character":0,"end_line":846,"end_character":64},"in_reply_to":"3fa7e38b_2677523f","updated":"2020-02-05 12:50:00.000000000","message":"Hi, Elod,  I checked the Ia06940cff7c3b71938eddb271d2cb8170e02e954 patch, seems it don\u0027t change the formatting here. It changed the #838.  So I think this patch we don\u0027t need to change here, right?","commit_id":"6cc8adb132b91be68c0b22c750417efb97f08ce0"},{"author":{"_account_id":17685,"name":"Elod Illes","email":"elod.illes@est.tech","username":"elod.illes"},"change_message_id":"529e0399144b06bb46f7cda6c0b8d76f1551f166","unresolved":false,"context_lines":[{"line_number":840,"context_line":"                    mock_get_backup_base_name.return_value \u003d base_name"},{"line_number":841,"context_line":"                    mock_get_new_snap_name.return_value \u003d \u0027new_snap\u0027"},{"line_number":842,"context_line":"                    image \u003d self.service.rbd.Image()"},{"line_number":843,"context_line":"                    meta \u003d linuxrbd.RBDImageMetadata(image,"},{"line_number":844,"context_line":"                                                     \u0027pool_foo\u0027,"},{"line_number":845,"context_line":"                                                     \u0027user_foo\u0027,"},{"line_number":846,"context_line":"                                                     \u0027conf_foo\u0027)"},{"line_number":847,"context_line":"                    rbdio \u003d linuxrbd.RBDVolumeIOWrapper(meta)"},{"line_number":848,"context_line":"                    rbdio.seek(0)"},{"line_number":849,"context_line":"                    self.service._backup_rbd(self.alt_backup, rbdio, vol_name,"}],"source_content_type":"text/x-python","patch_set":1,"id":"3fa7e38b_17dd666d","line":846,"range":{"start_line":843,"start_character":0,"end_line":846,"end_character":64},"in_reply_to":"3fa7e38b_347420cd","updated":"2020-02-07 14:40:31.000000000","message":"@wanghao @Luigi:\n\nIt\u0027s not a big deal, it just differs a bit from the cherry-picked patch formatting, please see the exact line to see what I meant:\n\nhttps://review.opendev.org/#/c/627941/58/cinder/tests/unit/backup/drivers/test_backup_ceph.py@846","commit_id":"6cc8adb132b91be68c0b22c750417efb97f08ce0"},{"author":{"_account_id":17685,"name":"Elod Illes","email":"elod.illes@est.tech","username":"elod.illes"},"change_message_id":"aa8847df1547f0ce2b766cef7a95b9fade23c73b","unresolved":false,"context_lines":[{"line_number":840,"context_line":"                    mock_get_backup_base_name.return_value \u003d base_name"},{"line_number":841,"context_line":"                    mock_get_new_snap_name.return_value \u003d \u0027new_snap\u0027"},{"line_number":842,"context_line":"                    image \u003d self.service.rbd.Image()"},{"line_number":843,"context_line":"                    meta \u003d linuxrbd.RBDImageMetadata(image,"},{"line_number":844,"context_line":"                                                     \u0027pool_foo\u0027,"},{"line_number":845,"context_line":"                                                     \u0027user_foo\u0027,"},{"line_number":846,"context_line":"                                                     \u0027conf_foo\u0027)"},{"line_number":847,"context_line":"                    rbdio \u003d linuxrbd.RBDVolumeIOWrapper(meta)"},{"line_number":848,"context_line":"                    rbdio.seek(0)"},{"line_number":849,"context_line":"                    self.service._backup_rbd(self.alt_backup, rbdio, vol_name,"}],"source_content_type":"text/x-python","patch_set":1,"id":"3fa7e38b_c9797181","line":846,"range":{"start_line":843,"start_character":0,"end_line":846,"end_character":64},"in_reply_to":"3fa7e38b_6e672354","updated":"2020-02-07 18:46:36.000000000","message":"Thanks!","commit_id":"6cc8adb132b91be68c0b22c750417efb97f08ce0"},{"author":{"_account_id":20813,"name":"Sofia Enriquez","email":"lsofia.enriquez@gmail.com","username":"enriquetaso"},"change_message_id":"0bef6f43e296668bb57a8b600ec8d04cc178fb03","unresolved":false,"context_lines":[{"line_number":840,"context_line":"                    mock_get_backup_base_name.return_value \u003d base_name"},{"line_number":841,"context_line":"                    mock_get_new_snap_name.return_value \u003d \u0027new_snap\u0027"},{"line_number":842,"context_line":"                    image \u003d self.service.rbd.Image()"},{"line_number":843,"context_line":"                    meta \u003d linuxrbd.RBDImageMetadata(image,"},{"line_number":844,"context_line":"                                                     \u0027pool_foo\u0027,"},{"line_number":845,"context_line":"                                                     \u0027user_foo\u0027,"},{"line_number":846,"context_line":"                                                     \u0027conf_foo\u0027)"},{"line_number":847,"context_line":"                    rbdio \u003d linuxrbd.RBDVolumeIOWrapper(meta)"},{"line_number":848,"context_line":"                    rbdio.seek(0)"},{"line_number":849,"context_line":"                    self.service._backup_rbd(self.alt_backup, rbdio, vol_name,"}],"source_content_type":"text/x-python","patch_set":1,"id":"3fa7e38b_6e672354","line":846,"range":{"start_line":843,"start_character":0,"end_line":846,"end_character":64},"in_reply_to":"3fa7e38b_77de1a3d","updated":"2020-02-07 18:19:38.000000000","message":"I\u0027ll fix it. I think I kept the old code here while solving the conflicts.","commit_id":"6cc8adb132b91be68c0b22c750417efb97f08ce0"},{"author":{"_account_id":10459,"name":"Luigi Toscano","email":"ltoscano@redhat.com","username":"ltoscano"},"change_message_id":"880db56444c71ab90a08db2376852525da784f9c","unresolved":false,"context_lines":[{"line_number":840,"context_line":"                    mock_get_backup_base_name.return_value \u003d base_name"},{"line_number":841,"context_line":"                    mock_get_new_snap_name.return_value \u003d \u0027new_snap\u0027"},{"line_number":842,"context_line":"                    image \u003d self.service.rbd.Image()"},{"line_number":843,"context_line":"                    meta \u003d linuxrbd.RBDImageMetadata(image,"},{"line_number":844,"context_line":"                                                     \u0027pool_foo\u0027,"},{"line_number":845,"context_line":"                                                     \u0027user_foo\u0027,"},{"line_number":846,"context_line":"                                                     \u0027conf_foo\u0027)"},{"line_number":847,"context_line":"                    rbdio \u003d linuxrbd.RBDVolumeIOWrapper(meta)"},{"line_number":848,"context_line":"                    rbdio.seek(0)"},{"line_number":849,"context_line":"                    self.service._backup_rbd(self.alt_backup, rbdio, vol_name,"}],"source_content_type":"text/x-python","patch_set":1,"id":"3fa7e38b_347420cd","line":846,"range":{"start_line":843,"start_character":0,"end_line":846,"end_character":64},"in_reply_to":"3fa7e38b_78b877e6","updated":"2020-02-07 14:25:14.000000000","message":"Elod, it seems that the code formatting matches the original patch:\nhttps://review.opendev.org/#/c/627941/58/cinder/tests/unit/backup/drivers/test_backup_ceph.py","commit_id":"6cc8adb132b91be68c0b22c750417efb97f08ce0"}]}