🌐 US-Proxy
class="logged-out env-production page-responsive" style="word-wrap: break-word;" >
Skip to content

Harden RPC support classes (backport #2000) - #2002

Merged
acogoluegnes merged 3 commits into
v5.xfrom
mergify/bp/v5.x/pr-2000
Jun 30, 2026
Merged

Harden RPC support classes (backport #2000)#2002
acogoluegnes merged 3 commits into
v5.xfrom
mergify/bp/v5.x/pr-2000

Conversation

@mergify

@mergify mergify Bot commented Jun 29, 2026

Copy link
Copy Markdown

This is an automatic backport of pull request #2000 done by [Mergify](https://mergify.com).

(cherry picked from commit f85d038)

# Conflicts:
#	src/main/java/com/rabbitmq/tools/jsonrpc/JsonRpcClient.java
@mergify mergify Bot added the conflicts label Jun 29, 2026
@mergify

mergify Bot commented Jun 29, 2026

Copy link
Copy Markdown
Author

Cherry-pick of f85d038 has failed:

On branch mergify/bp/v5.x/pr-2000
Your branch is ahead of 'origin/v5.x' by 1 commit.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit f85d038d.
  (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:   src/test/java/com/rabbitmq/client/AbstractJsonRpcTest.java

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   src/main/java/com/rabbitmq/tools/jsonrpc/JsonRpcClient.java

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 mentioned this pull request Jun 29, 2026
@acogoluegnes acogoluegnes added this to the 5.33.0 milestone Jun 30, 2026
@acogoluegnes
acogoluegnes merged commit f02566a into v5.x Jun 30, 2026
4 checks passed
@acogoluegnes
acogoluegnes deleted the mergify/bp/v5.x/pr-2000 branch June 30, 2026 05:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant