)]}'
{"/COMMIT_MSG":[{"author":{"_account_id":21798,"name":"Bernard Cafarelli","email":"bcafarel@redhat.com","username":"bcafarel"},"change_message_id":"afaf1ba17d8a9771d4bb068cd38276a917c771b5","unresolved":true,"context_lines":[{"line_number":23,"context_line":"redundant code in there."},{"line_number":24,"context_line":""},{"line_number":25,"context_line":"[1]: I0391dd24224f8656a09ddb002e7dae8783ba37a4"},{"line_number":26,"context_line":""},{"line_number":27,"context_line":"Change-Id: I04793caeaa71adbb1abcbda58aa43e63ce51d1e6"},{"line_number":28,"context_line":"(cherry picked from commit bf155a8ee7f74db748192458e58a005297f9ffec)"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":5,"id":"149cd0f9_1658059d","line":26,"updated":"2022-05-13 09:08:15.000000000","message":"Something like (line generated by git cherry-pick)\n\nConflicts:\n        neutron_vpnaas/tests/functional/common/test_scenario.py","commit_id":"9c952e653e23cb779a84b60579ce488664e53264"}],"/PATCHSET_LEVEL":[{"author":{"_account_id":21798,"name":"Bernard Cafarelli","email":"bcafarel@redhat.com","username":"bcafarel"},"change_message_id":"afaf1ba17d8a9771d4bb068cd38276a917c771b5","unresolved":false,"context_lines":[],"source_content_type":"","patch_set":5,"id":"81a8dd13_ef19f77a","updated":"2022-05-13 09:08:15.000000000","message":"Backport code itself looks good, can you add conflicts line to commit message?\nhttps://docs.openstack.org/project-team-guide/stable-branches.html#conflicts\n\nOnce this is good, similar remark for older branches :)","commit_id":"9c952e653e23cb779a84b60579ce488664e53264"},{"author":{"_account_id":1004,"name":"Mohammed Naser","email":"mnaser@vexxhost.com","username":"mnaser"},"change_message_id":"1068926c13c846e5146f4044d80da089147674ac","unresolved":false,"context_lines":[],"source_content_type":"","patch_set":5,"id":"37fcaa83_8ed29917","updated":"2022-05-12 17:44:02.000000000","message":"friendly ping on this 😊","commit_id":"9c952e653e23cb779a84b60579ce488664e53264"},{"author":{"_account_id":8313,"name":"Lajos Katona","display_name":"lajoskatona","email":"katonalala@gmail.com","username":"elajkat","status":"Ericsson Software Technology"},"change_message_id":"11b3406adae45a8b4437cf692f2539eea9bdf844","unresolved":false,"context_lines":[],"source_content_type":"","patch_set":6,"id":"8bbda23b_4a084289","updated":"2022-05-13 18:54:21.000000000","message":"Thanks","commit_id":"86fb6b97ae10347aed321a50f57f639bce3ea9f2"},{"author":{"_account_id":1004,"name":"Mohammed Naser","email":"mnaser@vexxhost.com","username":"mnaser"},"change_message_id":"08430f8781150cfc9b2fcf7eebb867cec2782071","unresolved":false,"context_lines":[],"source_content_type":"","patch_set":6,"id":"7b0b4148_28954c54","updated":"2022-05-15 18:35:52.000000000","message":"recheck","commit_id":"86fb6b97ae10347aed321a50f57f639bce3ea9f2"}],"neutron_vpnaas/tests/functional/common/test_scenario.py":[{"author":{"_account_id":8313,"name":"Lajos Katona","display_name":"lajoskatona","email":"katonalala@gmail.com","username":"elajkat","status":"Ericsson Software Technology"},"change_message_id":"6fc1720d5bd4392f470b412570b4aa5b5e6fe666","unresolved":true,"context_lines":[{"line_number":293,"context_line":""},{"line_number":294,"context_line":"    def setUp(self):"},{"line_number":295,"context_line":"        super(TestIPSecBase, self).setUp()"},{"line_number":296,"context_line":"        mock.patch(\u0027neutron.agent.l3.agent.L3PluginApi\u0027).start()"},{"line_number":297,"context_line":"        mock.patch(\u0027neutron_vpnaas.services.vpn.device_drivers.ipsec.\u0027"},{"line_number":298,"context_line":"            \u0027IPsecVpnDriverApi\u0027).start()"},{"line_number":299,"context_line":"        # avoid report_status running periodically"}],"source_content_type":"text/x-python","patch_set":4,"id":"8e3f6965_ed2eb03b","side":"PARENT","line":296,"range":{"start_line":296,"start_character":8,"end_line":296,"end_character":64},"updated":"2022-05-04 14:19:53.000000000","message":"this line was removed in the original patch, don\u0027t you need to remove it here also?","commit_id":"d73919979a14568e25923fac1ff4fad2e6e2ebbf"},{"author":{"_account_id":1004,"name":"Mohammed Naser","email":"mnaser@vexxhost.com","username":"mnaser"},"change_message_id":"00d972e75d3cf6236f40dd027191cd29fd7a1296","unresolved":true,"context_lines":[{"line_number":293,"context_line":""},{"line_number":294,"context_line":"    def setUp(self):"},{"line_number":295,"context_line":"        super(TestIPSecBase, self).setUp()"},{"line_number":296,"context_line":"        mock.patch(\u0027neutron.agent.l3.agent.L3PluginApi\u0027).start()"},{"line_number":297,"context_line":"        mock.patch(\u0027neutron_vpnaas.services.vpn.device_drivers.ipsec.\u0027"},{"line_number":298,"context_line":"            \u0027IPsecVpnDriverApi\u0027).start()"},{"line_number":299,"context_line":"        # avoid report_status running periodically"}],"source_content_type":"text/x-python","patch_set":4,"id":"11361c22_fc736cfc","side":"PARENT","line":296,"range":{"start_line":296,"start_character":8,"end_line":296,"end_character":64},"in_reply_to":"7f9354c4_6d2f34d6","updated":"2022-05-06 21:24:21.000000000","message":"ah you\u0027re right, can I drop it from here?","commit_id":"d73919979a14568e25923fac1ff4fad2e6e2ebbf"},{"author":{"_account_id":21798,"name":"Bernard Cafarelli","email":"bcafarel@redhat.com","username":"bcafarel"},"change_message_id":"7b06db5fbe86a6a1c21606182f174e5ed7c36499","unresolved":true,"context_lines":[{"line_number":293,"context_line":""},{"line_number":294,"context_line":"    def setUp(self):"},{"line_number":295,"context_line":"        super(TestIPSecBase, self).setUp()"},{"line_number":296,"context_line":"        mock.patch(\u0027neutron.agent.l3.agent.L3PluginApi\u0027).start()"},{"line_number":297,"context_line":"        mock.patch(\u0027neutron_vpnaas.services.vpn.device_drivers.ipsec.\u0027"},{"line_number":298,"context_line":"            \u0027IPsecVpnDriverApi\u0027).start()"},{"line_number":299,"context_line":"        # avoid report_status running periodically"}],"source_content_type":"text/x-python","patch_set":4,"id":"7f9354c4_6d2f34d6","side":"PARENT","line":296,"range":{"start_line":296,"start_character":8,"end_line":296,"end_character":64},"in_reply_to":"8e3f6965_ed2eb03b","updated":"2022-05-04 15:43:54.000000000","message":"I guess cherry-pick did not apply cleanly too (comparing to master) so probably need a Conflicts line too - and this is maybe reason for missing removal here?","commit_id":"d73919979a14568e25923fac1ff4fad2e6e2ebbf"}]}
