Skip to content

HTTP API: refactor how QQ replica ops fetch node names (backport #15627)#15628

Merged
michaelklishin merged 1 commit intov4.2.xfrom
mergify/bp/v4.2.x/pr-15627
Mar 4, 2026
Merged

HTTP API: refactor how QQ replica ops fetch node names (backport #15627)#15628
michaelklishin merged 1 commit intov4.2.xfrom
mergify/bp/v4.2.x/pr-15627

Conversation

@mergify
Copy link
Copy Markdown

@mergify mergify bot commented Mar 4, 2026

Follow-up to #15621 #15622 #15625.

This is an automatic backport of pull request #15627 done by Mergify.

@mergify mergify bot added the conflicts label Mar 4, 2026
@mergify
Copy link
Copy Markdown
Author

mergify bot commented Mar 4, 2026

Cherry-pick of ea61ce2 has failed:

On branch mergify/bp/v4.2.x/pr-15627
Your branch is up to date with 'origin/v4.2.x'.

You are currently cherry-picking commit ea61ce256.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   deps/rabbitmq_management/src/rabbit_mgmt_nodes.erl
	modified:   deps/rabbitmq_management/src/rabbit_mgmt_util.erl
	modified:   deps/rabbitmq_management/src/rabbit_mgmt_wm_node_memory_ets.erl
	modified:   deps/rabbitmq_management/src/rabbit_mgmt_wm_queue_get.erl
	modified:   deps/rabbitmq_management/src/rabbit_mgmt_wm_quorum_queue_replicas_add_member.erl
	modified:   deps/rabbitmq_management/src/rabbit_mgmt_wm_quorum_queue_replicas_delete_member.erl
	modified:   deps/rabbitmq_management/src/rabbit_mgmt_wm_quorum_queue_replicas_grow.erl
	modified:   deps/rabbitmq_management/src/rabbit_mgmt_wm_quorum_queue_replicas_shrink.erl
	new file:   deps/rabbitmq_management/test/unit_SUITE.erl

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   deps/rabbit_common/test/unit_SUITE.erl
	deleted by us:   deps/rabbit_common/test/unit_prop_SUITE.erl

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify mergify bot added the conflicts label Mar 4, 2026
@michaelklishin
HTTP API: refactor how QQ replica ops fetch node names
98f9f7e 
(cherry picked from commit ea61ce2)

# Conflicts:
#	deps/rabbit_common/test/unit_SUITE.erl
#	deps/rabbit_common/test/unit_prop_SUITE.erl
@michaelklishin michaelklishin force-pushed the mergify/bp/v4.2.x/pr-15627 branch from 8ea2fcc to 98f9f7e Compare March 4, 2026 03:16
@michaelklishin michaelklishin added this to the 4.2.5 milestone Mar 4, 2026
@michaelklishin michaelklishin merged commit cd5f103 into v4.2.x Mar 4, 2026
294 checks passed
@michaelklishin michaelklishin deleted the mergify/bp/v4.2.x/pr-15627 branch March 4, 2026 03:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@michaelklishin michaelklishin

Labels

conflicts

Projects

None yet

Milestone

4.2.5

Development

Successfully merging this pull request may close these issues.

1 participant

@michaelklishin