Skip to content
This repository was archived by the owner on Jan 22, 2025. It is now read-only.

enforces hash domain for ping-pong protocol (backport #28433)#28961

Merged
mergify[bot] merged 2 commits into
v1.13from
mergify/bp/v1.13/pr-28433
Nov 28, 2022
Merged

enforces hash domain for ping-pong protocol (backport #28433)#28961
mergify[bot] merged 2 commits into
v1.13from
mergify/bp/v1.13/pr-28433

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify Bot commented Nov 28, 2022

This is an automatic backport of pull request #28433 done by Mergify.
Cherry-pick of e283461 has failed:

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

You are currently cherry-picking commit e283461d9.
  (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:   core/src/ancestor_hashes_service.rs
	modified:   core/src/serve_repair.rs
	modified:   gossip/src/ping_pong.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   gossip/src/cluster_info.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

#27193
added hash domain to ping-pong protocol.
For backward compatibility responses both with and without domain were
generated and accepted.
Now that all clusters are upgraded, this commit enforces the hash domain
by removing the response without the domain.

(cherry picked from commit e283461)

# Conflicts:
#	gossip/src/cluster_info.rs
@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 Nov 28, 2022
@mergify
Copy link
Copy Markdown
Contributor Author

mergify Bot commented Nov 28, 2022

automerge label removed due to a CI failure

@mergify mergify Bot added the automerge Merge this Pull Request automatically once CI passes label Nov 28, 2022
@mergify mergify Bot merged commit c351c2d into v1.13 Nov 28, 2022
@mergify mergify Bot deleted the mergify/bp/v1.13/pr-28433 branch November 28, 2022 19:41
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

automerge Merge this Pull Request automatically once CI passes conflicts

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant