)]}'
{"/COMMIT_MSG":[{"author":{"_account_id":17685,"name":"Elod Illes","email":"elod.illes@est.tech","username":"elod.illes"},"change_message_id":"c48611ddfc46dd0c9585d313f3e3f3be783446e0","unresolved":false,"context_lines":[{"line_number":23,"context_line":""},{"line_number":24,"context_line":"Conflicts:"},{"line_number":25,"context_line":"      nova/compute/manager.py"},{"line_number":26,"context_line":"Conflict is due to I2af45a9540e7ccd60ace80d9fcadc79972da7df7 is missing"},{"line_number":27,"context_line":"form rocky"},{"line_number":28,"context_line":""},{"line_number":29,"context_line":"Change-Id: I4bc81b482380c5778781659c4d167a712316dab4"},{"line_number":30,"context_line":"Closes-Bug: #1724172"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":1,"id":"3fa7e38b_bf596e8e","line":27,"range":{"start_line":26,"start_character":0,"end_line":27,"end_character":10},"updated":"2019-10-15 17:05:34.000000000","message":"Actually, the conflict in manager.py is caused by not having patch I8ec3a3a697e55941ee447d0b52d29785717e4bf0 on stable/rocky.\n\nThe patch you mention causing the conflict in test_compute_mgr.py","commit_id":"e44c2a5c818230faeed4e9172601bab538392177"},{"author":{"_account_id":10135,"name":"Lee Yarwood","display_name":"Lee Yarwood","email":"lyarwood@redhat.com","username":"lyarwood"},"change_message_id":"7680a3f1959b245afb81bdce3ba7758db2d05bda","unresolved":false,"context_lines":[{"line_number":23,"context_line":""},{"line_number":24,"context_line":"Conflicts:"},{"line_number":25,"context_line":"      nova/compute/manager.py"},{"line_number":26,"context_line":"Conflict is due to I2af45a9540e7ccd60ace80d9fcadc79972da7df7 is missing"},{"line_number":27,"context_line":"form rocky"},{"line_number":28,"context_line":""},{"line_number":29,"context_line":"Change-Id: I4bc81b482380c5778781659c4d167a712316dab4"},{"line_number":30,"context_line":"Closes-Bug: #1724172"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":1,"id":"3fa7e38b_b82916f3","line":27,"range":{"start_line":26,"start_character":0,"end_line":27,"end_character":10},"in_reply_to":"3fa7e38b_bf596e8e","updated":"2019-10-23 09:09:13.000000000","message":"Can we get the commit updated to reference this?","commit_id":"e44c2a5c818230faeed4e9172601bab538392177"},{"author":{"_account_id":6873,"name":"Matt Riedemann","email":"mriedem.os@gmail.com","username":"mriedem"},"change_message_id":"3713abd0f9b7373ead5e1a8f4714bf6369943b77","unresolved":false,"context_lines":[{"line_number":18,"context_line":"even if the driver doesn\u0027t return that instance as exists on the"},{"line_number":19,"context_line":"hypervisor."},{"line_number":20,"context_line":""},{"line_number":21,"context_line":"Note that the functional test coverage will be added on top as it needs"},{"line_number":22,"context_line":"some refactoring that would make the bugfix non backportable."},{"line_number":23,"context_line":""},{"line_number":24,"context_line":"Conflicts:"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":2,"id":"3fa7e38b_1e7048da","line":21,"updated":"2019-10-23 20:09:47.000000000","message":"This isn\u0027t true here (rocky) on in the stein backport since it\u0027s https://review.opendev.org/#/c/512553/ which built on some stuff done in train that refactored a lot of how the fake driver stuff worked and we didn\u0027t want to backport that. Just noting it since I thought we had a functional test for this bug and now I remember why it\u0027s not coming before the fix as usual.","commit_id":"614e69b85459a4037d2d72efb37e4390032eea1a"}],"nova/compute/manager.py":[{"author":{"_account_id":17685,"name":"Elod Illes","email":"elod.illes@est.tech","username":"elod.illes"},"change_message_id":"c48611ddfc46dd0c9585d313f3e3f3be783446e0","unresolved":false,"context_lines":[{"line_number":707,"context_line":"        # compute_nodes of the resource tracker has not been populated yet so"},{"line_number":708,"context_line":"        # we cannot rely on the resource tracker here."},{"line_number":709,"context_line":"        compute_nodes \u003d {}"},{"line_number":710,"context_line":"        for instance_uuid, migration in evacuations.items():"},{"line_number":711,"context_line":"            try:"},{"line_number":712,"context_line":"                if instance_uuid in evacuated_local_instances:"},{"line_number":713,"context_line":"                    # Avoid the db call if we already have the instance loaded"}],"source_content_type":"text/x-python","patch_set":1,"id":"3fa7e38b_5f487ab1","line":710,"updated":"2019-10-15 17:05:34.000000000","message":"nit: missing blank line","commit_id":"e44c2a5c818230faeed4e9172601bab538392177"},{"author":{"_account_id":6873,"name":"Matt Riedemann","email":"mriedem.os@gmail.com","username":"mriedem"},"change_message_id":"5014314ade00b86f3d06eb7886a1f376d1b870cc","unresolved":false,"context_lines":[{"line_number":707,"context_line":"        # compute_nodes of the resource tracker has not been populated yet so"},{"line_number":708,"context_line":"        # we cannot rely on the resource tracker here."},{"line_number":709,"context_line":"        compute_nodes \u003d {}"},{"line_number":710,"context_line":"        for instance_uuid, migration in evacuations.items():"},{"line_number":711,"context_line":"            try:"},{"line_number":712,"context_line":"                if instance_uuid in evacuated_local_instances:"},{"line_number":713,"context_line":"                    # Avoid the db call if we already have the instance loaded"}],"source_content_type":"text/x-python","patch_set":2,"id":"3fa7e38b_be9014ef","line":710,"updated":"2019-10-23 20:08:03.000000000","message":"It\u0027s not a huge deal, but in the stein version there is a blank line between compute_nodes and the for loop:\n\nhttps://review.opendev.org/#/c/662189/1/nova/compute/manager.py@698","commit_id":"614e69b85459a4037d2d72efb37e4390032eea1a"}]}