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

removes redundant (mutable) self receivers (backport #18574) #18580

Merged
merged 2 commits into from
Jul 11, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 10, 2021

This is an automatic backport of pull request #18574 done by Mergify.
Cherry-pick of 918b5c2 has failed:

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

You are currently cherry-picking commit 918b5c28b.
  (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/crds_gossip.rs
	modified:   gossip/src/crds_gossip_pull.rs
	modified:   gossip/src/crds_gossip_push.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.io/

(cherry picked from commit 918b5c2)

# Conflicts:
#	gossip/src/cluster_info.rs
@mergify mergify bot added conflicts automerge Merge this Pull Request automatically once CI passes labels Jul 10, 2021
@solana-grimes solana-grimes removed the automerge Merge this Pull Request automatically once CI passes label Jul 10, 2021
@solana-grimes
Copy link
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 Jul 11, 2021
@codecov
Copy link

codecov bot commented Jul 11, 2021

Codecov Report

Merging #18580 (6feb4ea) into v1.7 (a6a302f) will decrease coverage by 0.0%.
The diff coverage is 91.8%.

@@            Coverage Diff            @@
##             v1.7   #18580     +/-   ##
=========================================
- Coverage    82.3%    82.3%   -0.1%     
=========================================
  Files         432      432             
  Lines      121713   121699     -14     
=========================================
- Hits       100217   100192     -25     
- Misses      21496    21507     +11     

@mergify mergify bot merged commit 6abd5fb into v1.7 Jul 11, 2021
@mergify mergify bot deleted the mergify/bp/v1.7/pr-18574 branch July 11, 2021 01:02
@brooksprumo brooksprumo mentioned this pull request Aug 23, 2021
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.

2 participants