Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

test: add NodeURI for clientCtx (backport #18930) #18987

Merged
merged 2 commits into from
Jan 9, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 9, 2024

This is an automatic backport of pull request #18930 done by Mergify.
Cherry-pick of 24a8123 has failed:

On branch mergify/bp/release/v0.50.x/pr-18930
Your branch is up to date with 'origin/release/v0.50.x'.

You are currently cherry-picking commit 24a8123c2.
  (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)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   CHANGELOG.md
	both modified:   testutil/network/network.go

no changes added to commit (use "git add" and/or "git commit -a")

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


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

(cherry picked from commit 24a8123)

# Conflicts:
#	CHANGELOG.md
#	testutil/network/network.go
@mergify mergify bot requested a review from a team as a code owner January 9, 2024 12:14
@mergify mergify bot added the conflicts label Jan 9, 2024
@mergify mergify bot mentioned this pull request Jan 9, 2024
12 tasks
@tac0turtle tac0turtle enabled auto-merge (squash) January 9, 2024 12:28
@tac0turtle tac0turtle merged commit 2a0e4a1 into release/v0.50.x Jan 9, 2024
44 of 46 checks passed
@tac0turtle tac0turtle deleted the mergify/bp/release/v0.50.x/pr-18930 branch January 9, 2024 14:42
@faddat faddat mentioned this pull request Nov 8, 2024
12 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants