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

make ping cache rate limit delay configurable (backport #27955) #28595

Merged
merged 2 commits into from
Oct 26, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 26, 2022

This is an automatic backport of pull request #27955 done by Mergify.
Cherry-pick of 8b0f9b4 has failed:

On branch mergify/bp/v1.13/pr-27955
Your branch is up to date with 'origin/v1.13'.

You are currently cherry-picking commit 8b0f9b491.
  (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:   gossip/src/cluster_info.rs
	modified:   gossip/src/crds_gossip_pull.rs
	modified:   gossip/src/ping_pong.rs
	modified:   gossip/tests/crds_gossip.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   core/src/serve_repair.rs

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 8b0f9b4)

# Conflicts:
#	core/src/serve_repair.rs
@mergify mergify bot added the conflicts label Oct 26, 2022
@mergify mergify bot added automerge Merge this Pull Request automatically once CI passes and removed automerge Merge this Pull Request automatically once CI passes labels Oct 26, 2022
@mergify
Copy link
Contributor Author

mergify bot commented Oct 26, 2022

automerge label removed due to a CI failure

@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Oct 26, 2022
@mergify
Copy link
Contributor Author

mergify bot commented Oct 26, 2022

automerge label removed due to a CI failure

@mergify mergify bot added automerge Merge this Pull Request automatically once CI passes and removed automerge Merge this Pull Request automatically once CI passes labels Oct 26, 2022
@mergify mergify bot merged commit 9382e90 into v1.13 Oct 26, 2022
@mergify mergify bot deleted the mergify/bp/v1.13/pr-27955 branch October 26, 2022 02:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
automerge Merge this Pull Request automatically once CI passes conflicts
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

1 participant