)]}'
{"id":"openstack%2Fcliff~968813","triplet_id":"openstack%2Fcliff~master~Idf0ae7250067dd49be80cd7cf7f2e12e0c21f6c5","project":"openstack/cliff","branch":"master","topic":"conflict-resolution","hashtags":[],"change_id":"Idf0ae7250067dd49be80cd7cf7f2e12e0c21f6c5","subject":"Revert \"Implement conflict resolution\"","status":"MERGED","created":"2025-11-28 15:14:51.000000000","updated":"2025-11-28 18:09:29.000000000","submitted":"2025-11-28 18:08:44.000000000","submitter":{"_account_id":22348,"name":"Zuul","username":"zuul","tags":["SERVICE_USER"]},"total_comment_count":0,"unresolved_comment_count":0,"has_review_started":true,"submission_id":"968813-conflict-resolution","meta_rev_id":"37b5227f6d62fa5e9286d76c3f668906f5e5e0e4","_number":968813,"virtual_id_number":968813,"owner":{"_account_id":15334,"name":"Stephen Finucane","display_name":"stephenfin","email":"stephenfin@redhat.com","username":"sfinucan"},"actions":{},"labels":{"Verified":{"approved":{"_account_id":22348,"name":"Zuul","username":"zuul","tags":["SERVICE_USER"]},"all":[{"value":0,"_account_id":15334,"name":"Stephen Finucane","display_name":"stephenfin","email":"stephenfin@redhat.com","username":"sfinucan"},{"tag":"autogenerated:zuul:gate","value":2,"date":"2025-11-28 18:08:44.000000000","permitted_voting_range":{"min":2,"max":2},"_account_id":22348,"name":"Zuul","username":"zuul","tags":["SERVICE_USER"]}],"values":{"-2":"Fails","-1":"Doesn\u0027t seem to work"," 0":"No score","+1":"Works for me","+2":"Verified"},"description":"","default_value":0,"optional":true},"Code-Review":{"approved":{"_account_id":15334,"name":"Stephen Finucane","display_name":"stephenfin","email":"stephenfin@redhat.com","username":"sfinucan"},"all":[{"value":2,"date":"2025-11-28 15:16:03.000000000","permitted_voting_range":{"min":2,"max":2},"_account_id":15334,"name":"Stephen Finucane","display_name":"stephenfin","email":"stephenfin@redhat.com","username":"sfinucan"},{"value":0,"_account_id":22348,"name":"Zuul","username":"zuul","tags":["SERVICE_USER"]}],"values":{"-2":"Do not merge","-1":"This patch needs further work before it can be merged"," 0":"No score","+1":"Looks good to me, but someone else must approve","+2":"Looks good to me (core reviewer)"},"description":"","default_value":0,"optional":true},"Workflow":{"approved":{"_account_id":15334,"name":"Stephen Finucane","display_name":"stephenfin","email":"stephenfin@redhat.com","username":"sfinucan"},"all":[{"value":1,"date":"2025-11-28 15:16:03.000000000","permitted_voting_range":{"min":1,"max":1},"_account_id":15334,"name":"Stephen Finucane","display_name":"stephenfin","email":"stephenfin@redhat.com","username":"sfinucan"},{"value":0,"_account_id":22348,"name":"Zuul","username":"zuul","tags":["SERVICE_USER"]}],"values":{"-1":"Work in progress"," 0":"Ready for reviews","+1":"Approved"},"description":"","default_value":0,"optional":true}},"removable_reviewers":[],"reviewers":{"REVIEWER":[{"_account_id":15334,"name":"Stephen Finucane","display_name":"stephenfin","email":"stephenfin@redhat.com","username":"sfinucan"},{"_account_id":22348,"name":"Zuul","username":"zuul","tags":["SERVICE_USER"]}]},"pending_reviewers":{},"reviewer_updates":[{"updated":"2025-11-28 16:28:39.000000000","updated_by":{"_account_id":22348,"name":"Zuul","username":"zuul","tags":["SERVICE_USER"]},"reviewer":{"_account_id":22348,"name":"Zuul","username":"zuul","tags":["SERVICE_USER"]},"state":"REVIEWER"}],"messages":[{"id":"a487656ae6ff7f676c6c8b5d7a45a336d19ad03d","tag":"autogenerated:gerrit:newPatchSet","author":{"_account_id":15334,"name":"Stephen Finucane","display_name":"stephenfin","email":"stephenfin@redhat.com","username":"sfinucan"},"date":"2025-11-28 15:14:51.000000000","message":"Uploaded patch set 1.","accounts_in_message":[],"_revision_number":1},{"id":"1e9f059ddb891551dbbae4bbd4a3a4398ef7efa3","author":{"_account_id":15334,"name":"Stephen Finucane","display_name":"stephenfin","email":"stephenfin@redhat.com","username":"sfinucan"},"date":"2025-11-28 15:16:03.000000000","message":"Patch Set 1: Code-Review+2 Workflow+1","accounts_in_message":[],"_revision_number":1},{"id":"e5ad2f0cb19ff01a22e99e9e91a90787623775ff","tag":"autogenerated:zuul:check","author":{"_account_id":22348,"name":"Zuul","username":"zuul","tags":["SERVICE_USER"]},"date":"2025-11-28 16:28:39.000000000","message":"Patch Set 1: Verified+1\n\nBuild succeeded (check pipeline).\nhttps://zuul.opendev.org/t/openstack/buildset/b8b7a46357704f57adb729ab8e398b64\n\n- tempest-full-py3 https://zuul.opendev.org/t/openstack/build/ba5492b77cfd4e709f46c8e19ec046f7 : SUCCESS in 1h 12m 49s\n- openstack-tox-pep8 https://zuul.opendev.org/t/openstack/build/f41e67388d8b43e7abb9a40044171b45 : SUCCESS in 2m 38s\n- openstack-tox-py310 https://zuul.opendev.org/t/openstack/build/434ab64c3c7d4ef782c048b8e86758cb : SUCCESS in 3m 04s\n- openstack-tox-py312 https://zuul.opendev.org/t/openstack/build/91681016840b40d7af6892bb5ec67689 : SUCCESS in 2m 26s\n- openstack-tox-py313 https://zuul.opendev.org/t/openstack/build/edea8f4133f441fcb2b23b1345ee3eb7 : SUCCESS in 3m 06s\n- openstack-tox-docs https://zuul.opendev.org/t/openstack/build/ad4c6a0a74d740748d17659993d2cf5d : SUCCESS in 2m 22s\n- cliff-tox-py312-neutronclient-tip https://zuul.opendev.org/t/openstack/build/e293f895935848e79735b813bd21a0ae : SUCCESS in 2m 34s\n- osc-tox-py312-tips https://zuul.opendev.org/t/openstack/build/79d868700bea4c1691a8cb26811e96c6 : SUCCESS in 4m 50s","accounts_in_message":[],"_revision_number":1},{"id":"a8340fab5f35b05a80fa957e9cb713cd4f43bbb4","tag":"autogenerated:zuul:gate","author":{"_account_id":22348,"name":"Zuul","username":"zuul","tags":["SERVICE_USER"]},"date":"2025-11-28 16:29:04.000000000","message":"Patch Set 1: -Verified\n\nStarting gate jobs.","accounts_in_message":[],"_revision_number":1},{"id":"45b7c8f33f080b2c48dd9b3ed2155ce68b26f0e2","tag":"autogenerated:zuul:gate","author":{"_account_id":22348,"name":"Zuul","username":"zuul","tags":["SERVICE_USER"]},"date":"2025-11-28 18:08:44.000000000","message":"Patch Set 1: Verified+2\n\nBuild succeeded (gate pipeline).\nhttps://zuul.opendev.org/t/openstack/buildset/adf2ccb9cd05423e81dd24d1b8f87d37\n\n- tempest-full-py3 https://zuul.opendev.org/t/openstack/build/c825d644a43b404a9b4e8bf54818fb1e : SUCCESS in 1h 35m 32s\n- openstack-tox-pep8 https://zuul.opendev.org/t/openstack/build/3ccd1c3b231a4806a4e6a19a900e539f : SUCCESS in 2m 30s\n- openstack-tox-py310 https://zuul.opendev.org/t/openstack/build/e3f1e7b8c9cb461aaef44d58a80dea4a : SUCCESS in 2m 07s\n- openstack-tox-py313 https://zuul.opendev.org/t/openstack/build/54a0f313cad34ea085da2be6fc7f1917 : SUCCESS in 3m 31s\n- openstack-tox-docs https://zuul.opendev.org/t/openstack/build/c2d2d75a40434bea8f0c1eaedc7236c8 : SUCCESS in 2m 18s\n- cliff-tox-py312-neutronclient-tip https://zuul.opendev.org/t/openstack/build/ec39cff0dc7041158e90bd6a6d2cddf5 : SUCCESS in 2m 48s\n- osc-tox-py312-tips https://zuul.opendev.org/t/openstack/build/0a93fbf913a34e7a9a32d4f98155ef3e : SUCCESS in 4m 49s","accounts_in_message":[],"_revision_number":1},{"id":"eea856a50fa9df35fa5a183236185ae4e9b6fab0","tag":"autogenerated:gerrit:merged","author":{"_account_id":22348,"name":"Zuul","username":"zuul","tags":["SERVICE_USER"]},"date":"2025-11-28 18:08:44.000000000","message":"Change has been successfully merged","accounts_in_message":[],"_revision_number":1},{"id":"37b5227f6d62fa5e9286d76c3f668906f5e5e0e4","tag":"autogenerated:zuul:promote","author":{"_account_id":22348,"name":"Zuul","username":"zuul","tags":["SERVICE_USER"]},"date":"2025-11-28 18:09:29.000000000","message":"Patch Set 1:\n\nBuild succeeded (promote pipeline).\nhttps://zuul.opendev.org/t/openstack/buildset/02fccb3a12ce4749822e155f5541dcfe\n\n- promote-openstack-tox-docs https://zuul.opendev.org/t/openstack/build/cca9b37399e04a4e877e11748c9d18e6 : SUCCESS in 34s","accounts_in_message":[],"_revision_number":1}],"current_revision_number":1,"current_revision":"37edae702b0c1d5de2a6788e7b9fdeb9b3467684","revisions":{"37edae702b0c1d5de2a6788e7b9fdeb9b3467684":{"kind":"REWORK","_number":1,"created":"2025-11-28 15:14:51.000000000","uploader":{"_account_id":15334,"name":"Stephen Finucane","display_name":"stephenfin","email":"stephenfin@redhat.com","username":"sfinucan"},"ref":"refs/changes/13/968813/1","fetch":{"anonymous http":{"url":"https://review.opendev.org/openstack/cliff","ref":"refs/changes/13/968813/1","commands":{"Checkout":"git fetch https://review.opendev.org/openstack/cliff refs/changes/13/968813/1 \u0026\u0026 git checkout FETCH_HEAD","Cherry Pick":"git fetch https://review.opendev.org/openstack/cliff refs/changes/13/968813/1 \u0026\u0026 git cherry-pick FETCH_HEAD","Format Patch":"git fetch https://review.opendev.org/openstack/cliff refs/changes/13/968813/1 \u0026\u0026 git format-patch -1 --stdout FETCH_HEAD","Pull":"git pull https://review.opendev.org/openstack/cliff refs/changes/13/968813/1"}}},"commit":{"parents":[{"commit":"a2da89a8a2d65e16ffb4f3f991d47da3763cf3a4","subject":"Implement conflict resolution","web_links":[{"name":"gitea","tooltip":"Open in GitWeb","url":"https://opendev.org/openstack/cliff/commit/a2da89a8a2d65e16ffb4f3f991d47da3763cf3a4"}]}],"author":{"name":"Stephen Finucane","email":"sfinucan@redhat.com","date":"2025-11-28 10:51:53.000000000","tz":0},"committer":{"name":"Stephen Finucane","email":"sfinucan@redhat.com","date":"2025-11-28 10:54:02.000000000","tz":0},"subject":"Revert \"Implement conflict resolution\"","message":"Revert \"Implement conflict resolution\"\n\nThis reverts commit a2da89a8a2d65e16ffb4f3f991d47da3763cf3a4. We are\ngoing to need to take a different approach, since this one doesn\u0027t work\nas expected. stevedore\u0027s conflict resolution is based on extensions\nwithin a single namespace (entry point group), but we intentionally\nexpect commands to exist across multiple namespaces and only use\nnamespaces for organization purposes. Therefore, we can use stevedore to\nresolve conflicts within a single plugin namespace - where we should\neventually always error out - but will need our own mechanism to resolve\nconflicts in different namespaces.\n\nChange-Id: Idf0ae7250067dd49be80cd7cf7f2e12e0c21f6c5\nSigned-off-by: Stephen Finucane \u003csfinucan@redhat.com\u003e\n","web_links":[{"name":"gitea","tooltip":"Open in GitWeb","url":"https://opendev.org/openstack/cliff/commit/37edae702b0c1d5de2a6788e7b9fdeb9b3467684"}],"resolve_conflicts_web_links":[{"name":"gitea","tooltip":"Open in GitWeb","url":"https://opendev.org/openstack/cliff/commit/37edae702b0c1d5de2a6788e7b9fdeb9b3467684"}]},"branch":"refs/heads/master"}},"requirements":[],"submit_records":[{"rule_name":"gerrit~DefaultSubmitRule","status":"CLOSED","labels":[{"label":"Verified","status":"MAY","applied_by":{"_account_id":22348,"name":"Zuul","username":"zuul","tags":["SERVICE_USER"]}},{"label":"Code-Review","status":"MAY","applied_by":{"_account_id":15334,"name":"Stephen Finucane","display_name":"stephenfin","email":"stephenfin@redhat.com","username":"sfinucan"}},{"label":"Workflow","status":"MAY","applied_by":{"_account_id":15334,"name":"Stephen Finucane","display_name":"stephenfin","email":"stephenfin@redhat.com","username":"sfinucan"}}]}],"submit_requirements":[{"name":"Verified","description":"Verified in gate by CI","status":"SATISFIED","is_legacy":false,"submittability_expression_result":{"expression":"label:Verified\u003dMAX AND -label:Verified\u003dMIN","fulfilled":true,"status":"PASS","passing_atoms":["label:Verified\u003dMAX"],"failing_atoms":["label:Verified\u003dMIN"],"atom_explanations":{}}},{"name":"Code-Review","description":"Code reviewed by core reviewer","status":"SATISFIED","is_legacy":false,"submittability_expression_result":{"expression":"label:Code-Review\u003dMAX AND -label:Code-Review\u003dMIN","fulfilled":true,"status":"PASS","passing_atoms":["label:Code-Review\u003dMAX"],"failing_atoms":["label:Code-Review\u003dMIN"],"atom_explanations":{}}},{"name":"Workflow","description":"Approved for gate by core reviewer","status":"SATISFIED","is_legacy":false,"submittability_expression_result":{"expression":"label:Workflow\u003dMAX AND -label:Workflow\u003dMIN","fulfilled":true,"status":"PASS","passing_atoms":["label:Workflow\u003dMAX"],"failing_atoms":["label:Workflow\u003dMIN"],"atom_explanations":{}}}]}