This repository has been archived by the owner on Jan 22, 2025. It is now read-only.
removes id from push_lowest_slot args (backport #18645) #18649
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
![mergify[bot]](https://avatars.githubusercontent.com/in/10562?s=60&v=4){kind=small}
mergify
bot
added
conflicts
automerge
|
😱 New commits were pushed while the automerge label was present. |
solana-grimes
removed
the
automerge
|
@Mergifyio rebase |
|
Command
|
behzadnouri
force-pushed
the
mergify/bp/v1.7/pr-18645
branch
from
291a83b to
e2e927d
Compare
mergify
bot
added
automerge
|
automerge label removed due to a CI failure |
|
@Mergifyio rebase |
|
Command
|
|
@Mergifyio rebase |
|
Command
|
behzadnouri
force-pushed
the
mergify/bp/v1.7/pr-18645
branch
from
e2e927d to
3a76420
Compare
mergify
bot
added
automerge
|
automerge label removed due to a CI failure |
|
@Mergifyio rebase |
push_lowest_slot cannot sign the new crds-value unless the id (pubkey) argument passed-in is the same pubkey as in ClusterInfo::keypair(), in which case the id argument is redundant: https://github.com/solana-labs/solana/blob/bb41cf346/gossip/src/cluster_info.rs#L824-L845 Additionally, the lookup is done with self.id(), but insert is done with the id argument, which is logically a bug. (cherry picked from commit c90af3c) # Conflicts: # gossip/src/cluster_info.rs
CriesofCarrots
force-pushed
the
mergify/bp/v1.7/pr-18645
branch
from
3a76420 to
08e3ec9
Compare
|
Command
|
mergify
bot
added
the
automerge
Codecov Report
@@ Coverage Diff @@
## v1.7 #18649 +/- ##
=======================================
Coverage 82.3% 82.3%
=======================================
Files 432 432
Lines 122553 122547 -6
=======================================
+ Hits 100870 100891 +21
+ Misses 21683 21656 -27 |
Closed
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is an automatic backport of pull request #18645 done by Mergify.
Cherry-pick of c90af3c has failed:
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 refreshwill re-evaluate the rules@Mergifyio rebasewill rebase this PR on its base branch@Mergifyio updatewill merge the base branch into this PR@Mergifyio backport <destination>will backport this PR on<destination>branchAdditionally, on Mergify dashboard you can:
Finally, you can contact us on https://mergify.io/