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

discards serialized gossip crds votes if cannot parse tx (backport #22129)#22172

Merged
mergify[bot] merged 2 commits intov1.9from
mergify/bp/v1.9/pr-22129
Dec 29, 2021
Merged

discards serialized gossip crds votes if cannot parse tx (backport #22129)#22172
mergify[bot] merged 2 commits intov1.9from
mergify/bp/v1.9/pr-22129

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify Bot commented Dec 29, 2021

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

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

You are currently cherry-picking commit c9c78622a.
  (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:   local-cluster/src/cluster_tests.rs
	modified:   perf/src/sigverify.rs
	modified:   perf/src/test_tx.rs

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

# Conflicts:
#	gossip/src/crds_value.rs
@mergify mergify Bot added the conflicts label Dec 29, 2021
@mergify mergify Bot added the automerge Merge this Pull Request automatically once CI passes label Dec 29, 2021
@solana-grimes solana-grimes removed the automerge Merge this Pull Request automatically once CI passes label Dec 29, 2021
@solana-grimes
Copy link
Copy Markdown
Contributor

😱 New commits were pushed while the automerge label was present.

@mergify mergify Bot added the automerge Merge this Pull Request automatically once CI passes label Dec 29, 2021
@mergify
Copy link
Copy Markdown
Contributor Author

mergify Bot commented Dec 29, 2021

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 Dec 29, 2021
@codecov
Copy link
Copy Markdown

codecov Bot commented Dec 29, 2021

Codecov Report

Merging #22172 (b049053) into v1.9 (9fb67f9) will increase coverage by 0.0%.
The diff coverage is 94.8%.

@@           Coverage Diff           @@
##             v1.9   #22172   +/-   ##
=======================================
  Coverage    81.1%    81.1%           
=======================================
  Files         516      516           
  Lines      144646   144655    +9     
=======================================
+ Hits       117415   117440   +25     
+ Misses      27231    27215   -16     

@mergify mergify Bot merged commit 9c9d3e8 into v1.9 Dec 29, 2021
@mergify mergify Bot deleted the mergify/bp/v1.9/pr-22129 branch December 29, 2021 22:38
@brooksprumo brooksprumo mentioned this pull request Jan 5, 2022
@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented Apr 3, 2022

This PR has been automatically locked since there has not been any activity in past 14 days after it was merged.

@github-actions github-actions Bot locked as resolved and limited conversation to collaborators Apr 3, 2022
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 locked PR

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants