)]}'
{"/COMMIT_MSG":[{"author":{"_account_id":4690,"name":"melanie witt","display_name":"melwitt","email":"melwittt@gmail.com","username":"melwitt"},"change_message_id":"ee3c7f2ca2261597d9c9a7c3800c69a9d979b677","unresolved":true,"context_lines":[{"line_number":24,"context_line":"choose (based on imcomplete information) host which is already full."},{"line_number":25,"context_line":""},{"line_number":26,"context_line":"For more informations please see realted bug: #1729621"},{"line_number":27,"context_line":""},{"line_number":28,"context_line":"There is a stable/pike difference in the backport in"},{"line_number":29,"context_line":"test_compute_node_create_fail_retry_works() as the fix b576461"},{"line_number":30,"context_line":"in pike was made differently from the fix in queens 5a34309 due to at"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":6,"id":"d0aae3ae_b5e7c441","line":27,"updated":"2021-03-05 00:38:58.000000000","message":"This is missing the proper:\n\n Conflicts:\n     nova/tests/unit/compute/test_resource_tracker.py","commit_id":"1298a22181bd6f7d494a79188dbcf55418c8396a"},{"author":{"_account_id":4690,"name":"melanie witt","display_name":"melwitt","email":"melwittt@gmail.com","username":"melwitt"},"change_message_id":"fc470bae3b180995f01bca8554bf91b9f3df7e53","unresolved":true,"context_lines":[{"line_number":24,"context_line":"choose (based on imcomplete information) host which is already full."},{"line_number":25,"context_line":""},{"line_number":26,"context_line":"For more informations please see realted bug: #1729621"},{"line_number":27,"context_line":""},{"line_number":28,"context_line":"There is a stable/pike difference in the backport in"},{"line_number":29,"context_line":"test_compute_node_create_fail_retry_works() as the fix b576461"},{"line_number":30,"context_line":"in pike was made differently from the fix in queens 5a34309 due to at"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":6,"id":"94612313_383c555b","line":27,"in_reply_to":"d0aae3ae_b5e7c441","updated":"2021-03-05 01:11:53.000000000","message":"Correction: I looked at this again and see now that there is a merge conflict resolution *and* a difference in test_compute_node_create_fail_retry_works in this backport. The difference is explained in the commit message and the merge conflict is not mentioned.","commit_id":"1298a22181bd6f7d494a79188dbcf55418c8396a"},{"author":{"_account_id":4690,"name":"melanie witt","display_name":"melwitt","email":"melwittt@gmail.com","username":"melwitt"},"change_message_id":"ee3c7f2ca2261597d9c9a7c3800c69a9d979b677","unresolved":true,"context_lines":[{"line_number":28,"context_line":"There is a stable/pike difference in the backport in"},{"line_number":29,"context_line":"test_compute_node_create_fail_retry_works() as the fix b576461"},{"line_number":30,"context_line":"in pike was made differently from the fix in queens 5a34309 due to at"},{"line_number":31,"context_line":"that time pike does have the current backport proposed here."},{"line_number":32,"context_line":""},{"line_number":33,"context_line":"Change-Id: I120a98cc4c11772f24099081ef3ac44a50daf71d"},{"line_number":34,"context_line":"Closes-Bug: #1729621"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":6,"id":"2dac6602_b93c8e22","line":31,"updated":"2021-03-05 00:38:58.000000000","message":"I\u0027m afraid this doesn\u0027t really make sense to me :(\n\nWhen I cherry pick this locally I find the merge conflict is in _test_compute_node_created, not test_compute_node_create_fail_retry_works. And that it\u0027s because this change landed before I9fa1d509a3de405d6246fb8670612c65c10cc93b on other branches but here on stable/pike we are applying this change after I9fa1d509a3de405d6246fb8670612c65c10cc93b landed.","commit_id":"1298a22181bd6f7d494a79188dbcf55418c8396a"}]}