)]}'
{"/COMMIT_MSG":[{"author":{"_account_id":7634,"name":"Takashi Natsume","email":"takanattie@gmail.com","username":"natsumet"},"change_message_id":"3965b1a99d8008d131648d6df4af5481908d0410","unresolved":false,"context_lines":[{"line_number":36,"context_line":"actual instance disks and any additional storage required by the"},{"line_number":37,"context_line":"specific virt backend."},{"line_number":38,"context_line":""},{"line_number":39,"context_line":"NOTE(lyarwood): Conflicts due to If1b6e5f20d2ea82d94f5f0550f13189fc9bc16c4"},{"line_number":40,"context_line":"not being present in stable/queens."},{"line_number":41,"context_line":""},{"line_number":42,"context_line":"Conflicts:"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":1,"id":"dfd5e7cf_cdf7a5f5","line":39,"range":{"start_line":39,"start_character":33,"end_line":39,"end_character":74},"updated":"2019-01-08 01:28:13.000000000","message":"and I217fba9138132b107e9d62895d699d238392e761","commit_id":"f34bdea2db1d659ab3d7fe09f80d8e78b40a096a"},{"author":{"_account_id":10135,"name":"Lee Yarwood","display_name":"Lee Yarwood","email":"lyarwood@redhat.com","username":"lyarwood"},"change_message_id":"6642c76e291cc679fc3832b2adda9e2a3abc2922","unresolved":false,"context_lines":[{"line_number":36,"context_line":"actual instance disks and any additional storage required by the"},{"line_number":37,"context_line":"specific virt backend."},{"line_number":38,"context_line":""},{"line_number":39,"context_line":"NOTE(lyarwood): Conflicts due to If1b6e5f20d2ea82d94f5f0550f13189fc9bc16c4"},{"line_number":40,"context_line":"not being present in stable/queens."},{"line_number":41,"context_line":""},{"line_number":42,"context_line":"Conflicts:"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":1,"id":"dfd5e7cf_c2452c72","line":39,"range":{"start_line":39,"start_character":33,"end_line":39,"end_character":74},"in_reply_to":"dfd5e7cf_cdf7a5f5","updated":"2019-01-08 11:38:24.000000000","message":"I assume you\u0027re cherry picking directly from master in order for that to be a conflict? You should be cherry picking 02ab9f11d8db4f03a845a480cbc8fa2e28bffc14 from stable/rocky instead. As I217fba9138132b107e9d62895d699d238392e761 hasn\u0027t landed on stable/rocky yet it isn\u0027t a conflict.","commit_id":"f34bdea2db1d659ab3d7fe09f80d8e78b40a096a"},{"author":{"_account_id":6873,"name":"Matt Riedemann","email":"mriedem.os@gmail.com","username":"mriedem"},"change_message_id":"20315ca3d67704591e2f3d1371c83b70ee460f49","unresolved":false,"context_lines":[{"line_number":46,"context_line":"Partial-Bug: #1414895"},{"line_number":47,"context_line":"Change-Id: I8fd6b9f857a1c4919c3365951e2652d2d477df77"},{"line_number":48,"context_line":"(cherry picked from commit d6c1f6a1032ed2ea99f3d8b70ccf38065163d785)"},{"line_number":49,"context_line":"(cherry picked from commit 02ab9f11d8db4f03a845a480cbc8fa2e28bffc14)"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":1,"id":"bfdaf3ff_0b723ce4","line":49,"range":{"start_line":49,"start_character":27,"end_line":49,"end_character":67},"updated":"2019-01-16 03:15:29.000000000","message":"The stable/rocky commit changed since it was rebased/re-cherry-picked.","commit_id":"f34bdea2db1d659ab3d7fe09f80d8e78b40a096a"},{"author":{"_account_id":6873,"name":"Matt Riedemann","email":"mriedem.os@gmail.com","username":"mriedem"},"change_message_id":"7c98fd66a0383b520dcd675b16bc45bcd43cd48f","unresolved":false,"context_lines":[{"line_number":37,"context_line":"specific virt backend."},{"line_number":38,"context_line":""},{"line_number":39,"context_line":"NOTE(lyarwood): Conflicts as If1b6e5f20d2ea82d94f5f0550f13189fc9bc16c4"},{"line_number":40,"context_line":"only merged in Rocky and the backports of"},{"line_number":41,"context_line":"Id3c74c019da29070811ffc368351e2238b3f6da5 and"},{"line_number":42,"context_line":"I217fba9138132b107e9d62895d699d238392e761 have yet to land on"},{"line_number":43,"context_line":"stable/queens from stable/rocky."},{"line_number":44,"context_line":""},{"line_number":45,"context_line":"Conflicts:"},{"line_number":46,"context_line":"        nova/conf/workarounds.py"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":3,"id":"9fdfeff1_6b710a44","line":43,"range":{"start_line":40,"start_character":21,"end_line":43,"end_character":32},"updated":"2019-01-31 19:59:04.000000000","message":"We could rebase on at least one of these, or rebase them all in a series, couldn\u0027t we? Otherwise if we merge this we\u0027ll throw those others into merge conflict which kind of sucks for backports.","commit_id":"ab367c4d5fde50368ab291d59c8c94f10bd99da9"},{"author":{"_account_id":7166,"name":"Sylvain Bauza","email":"sbauza@redhat.com","username":"sbauza"},"change_message_id":"0d2c38f21866f4ab800d5c4180d3f84e0423a06a","unresolved":false,"context_lines":[{"line_number":37,"context_line":"specific virt backend."},{"line_number":38,"context_line":""},{"line_number":39,"context_line":"NOTE(lyarwood): Conflicts as If1b6e5f20d2ea82d94f5f0550f13189fc9bc16c4"},{"line_number":40,"context_line":"only merged in Rocky and the backports of"},{"line_number":41,"context_line":"Id3c74c019da29070811ffc368351e2238b3f6da5 and"},{"line_number":42,"context_line":"I217fba9138132b107e9d62895d699d238392e761 have yet to land on"},{"line_number":43,"context_line":"stable/queens from stable/rocky."},{"line_number":44,"context_line":""},{"line_number":45,"context_line":"Conflicts:"},{"line_number":46,"context_line":"        nova/conf/workarounds.py"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":3,"id":"9fdfeff1_ed58fc31","line":43,"range":{"start_line":40,"start_character":21,"end_line":43,"end_character":32},"in_reply_to":"9fdfeff1_6b710a44","updated":"2019-02-12 14:14:58.000000000","message":"Yeah we should just make this a series so we wouldn\u0027t have any conflicts, right?","commit_id":"ab367c4d5fde50368ab291d59c8c94f10bd99da9"}]}