)]}'
{"/COMMIT_MSG":[{"author":{"_account_id":17685,"name":"Elod Illes","email":"elod.illes@est.tech","username":"elod.illes"},"change_message_id":"736593121ce2ce6fe38fe47b413ec197ebae0e57","unresolved":false,"context_lines":[{"line_number":16,"context_line":""},{"line_number":17,"context_line":"      This change conflicted with another test that was added in later"},{"line_number":18,"context_line":"      releases. The resolution was to not include the additional test,"},{"line_number":19,"context_line":"      which isn\u0027t related to this change anyway."},{"line_number":20,"context_line":""},{"line_number":21,"context_line":"Closes-Bug: 1856881"},{"line_number":22,"context_line":"Change-Id: Iddc364d8c934b6e54d1e8c75b8b159faadbf865d"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":2,"id":"3fa7e38b_80d8c750","line":19,"updated":"2020-01-28 20:08:12.000000000","message":"(note to other reviewers: conflict is due to not having patch I4d99f630cb16e1d58261012e59d3a92c7035734c in stable/stein)","commit_id":"ba014fd189025df9c7632cb31c58f5027a8336ed"},{"author":{"_account_id":5046,"name":"Lance Bragstad","email":"lbragstad@redhat.com","username":"ldbragst"},"change_message_id":"2af6494068888ca607e02e64df1fead0eccfd269","unresolved":false,"context_lines":[{"line_number":16,"context_line":""},{"line_number":17,"context_line":"      This change conflicted with another test that was added in later"},{"line_number":18,"context_line":"      releases. The resolution was to not include the additional test,"},{"line_number":19,"context_line":"      which isn\u0027t related to this change anyway."},{"line_number":20,"context_line":""},{"line_number":21,"context_line":"Closes-Bug: 1856881"},{"line_number":22,"context_line":"Change-Id: Iddc364d8c934b6e54d1e8c75b8b159faadbf865d"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":2,"id":"3fa7e38b_d2fa0310","line":19,"in_reply_to":"3fa7e38b_80d8c750","updated":"2020-01-29 17:38:43.000000000","message":"Thanks, Elod. I added this to the commit message.","commit_id":"ba014fd189025df9c7632cb31c58f5027a8336ed"},{"author":{"_account_id":17685,"name":"Elod Illes","email":"elod.illes@est.tech","username":"elod.illes"},"change_message_id":"736593121ce2ce6fe38fe47b413ec197ebae0e57","unresolved":false,"context_lines":[{"line_number":20,"context_line":""},{"line_number":21,"context_line":"Closes-Bug: 1856881"},{"line_number":22,"context_line":"Change-Id: Iddc364d8c934b6e54d1e8c75b8b159faadbf865d"},{"line_number":23,"context_line":"(cherry picked from commit 25cf359e5fb914b855922121f20e23bd14626b8e)"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":2,"id":"3fa7e38b_000ff7d3","line":23,"updated":"2020-01-28 20:08:12.000000000","message":"The cherry-pick should be done branch-by-branch (so that is less likely to have a conflict, miss a branch, follow/review the cherry-pick, etc.)\n\nAlso that would add the line at the end:\n(cherry picked from commit 51ff7be731450c183b3e3eb6d34493e986cc2635)","commit_id":"ba014fd189025df9c7632cb31c58f5027a8336ed"},{"author":{"_account_id":5046,"name":"Lance Bragstad","email":"lbragstad@redhat.com","username":"ldbragst"},"change_message_id":"2af6494068888ca607e02e64df1fead0eccfd269","unresolved":false,"context_lines":[{"line_number":20,"context_line":""},{"line_number":21,"context_line":"Closes-Bug: 1856881"},{"line_number":22,"context_line":"Change-Id: Iddc364d8c934b6e54d1e8c75b8b159faadbf865d"},{"line_number":23,"context_line":"(cherry picked from commit 25cf359e5fb914b855922121f20e23bd14626b8e)"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":2,"id":"3fa7e38b_8dfeb001","line":23,"in_reply_to":"3fa7e38b_000ff7d3","updated":"2020-01-29 17:38:43.000000000","message":"Done","commit_id":"ba014fd189025df9c7632cb31c58f5027a8336ed"}],"keystone/tests/unit/test_cli.py":[{"author":{"_account_id":5046,"name":"Lance Bragstad","email":"lbragstad@redhat.com","username":"ldbragst"},"change_message_id":"36f9870d959536b9de7808f12d917df022441b5a","unresolved":false,"context_lines":[{"line_number":311,"context_line":""},{"line_number":312,"context_line":"            # ensure subsequent bootstrap attempts don\u0027t fail because of"},{"line_number":313,"context_line":"            # ambiguity"},{"line_number":314,"context_line":"            self._do_test_bootstrap(self.bootstrap)"},{"line_number":315,"context_line":""},{"line_number":316,"context_line":"class CliBootStrapTestCaseWithEnvironment(CliBootStrapTestCase):"},{"line_number":317,"context_line":""}],"source_content_type":"text/x-python","patch_set":2,"id":"3fa7e38b_4737494c","line":314,"updated":"2020-01-09 16:52:59.000000000","message":"Weird - this didn\u0027t cleanly apply during the cherry-pick. There should be a newline here.","commit_id":"ba014fd189025df9c7632cb31c58f5027a8336ed"},{"author":{"_account_id":17685,"name":"Elod Illes","email":"elod.illes@est.tech","username":"elod.illes"},"change_message_id":"736593121ce2ce6fe38fe47b413ec197ebae0e57","unresolved":false,"context_lines":[{"line_number":311,"context_line":""},{"line_number":312,"context_line":"            # ensure subsequent bootstrap attempts don\u0027t fail because of"},{"line_number":313,"context_line":"            # ambiguity"},{"line_number":314,"context_line":"            self._do_test_bootstrap(self.bootstrap)"},{"line_number":315,"context_line":""},{"line_number":316,"context_line":"class CliBootStrapTestCaseWithEnvironment(CliBootStrapTestCase):"},{"line_number":317,"context_line":""}],"source_content_type":"text/x-python","patch_set":2,"id":"3fa7e38b_c0b79fd6","line":314,"in_reply_to":"3fa7e38b_4737494c","updated":"2020-01-28 20:08:12.000000000","message":"This was the conflicting file so I guess needed some edit and missed the extra line. If that is added here, pep8 will be happy, too :)","commit_id":"ba014fd189025df9c7632cb31c58f5027a8336ed"},{"author":{"_account_id":5046,"name":"Lance Bragstad","email":"lbragstad@redhat.com","username":"ldbragst"},"change_message_id":"2af6494068888ca607e02e64df1fead0eccfd269","unresolved":false,"context_lines":[{"line_number":311,"context_line":""},{"line_number":312,"context_line":"            # ensure subsequent bootstrap attempts don\u0027t fail because of"},{"line_number":313,"context_line":"            # ambiguity"},{"line_number":314,"context_line":"            self._do_test_bootstrap(self.bootstrap)"},{"line_number":315,"context_line":""},{"line_number":316,"context_line":"class CliBootStrapTestCaseWithEnvironment(CliBootStrapTestCase):"},{"line_number":317,"context_line":""}],"source_content_type":"text/x-python","patch_set":2,"id":"3fa7e38b_0d0ac01c","line":314,"in_reply_to":"3fa7e38b_c0b79fd6","updated":"2020-01-29 17:38:43.000000000","message":"Done","commit_id":"ba014fd189025df9c7632cb31c58f5027a8336ed"}]}