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

skips process_push_message for local messages (backport #18493) #18532

Merged
merged 2 commits into from
Jul 9, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 9, 2021

This is an automatic backport of pull request #18493 done by Mergify.
Cherry-pick of 27cc757 has failed:

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

You are currently cherry-picking commit 27cc7577a.
  (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_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/

received_cache is not relevant for local messages, and does not need to
be updated:
https://github.com/solana-labs/solana/blob/92c5cdab6/gossip/src/crds_gossip_push.rs#L166-L189

(cherry picked from commit 27cc757)

# Conflicts:
#	gossip/src/cluster_info.rs
@mergify mergify bot added the conflicts label Jul 9, 2021
@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 Jul 9, 2021
@mergify
Copy link
Contributor Author

mergify bot commented Jul 9, 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 Jul 9, 2021
@mergify
Copy link
Contributor Author

mergify bot commented Jul 9, 2021

automerge label removed due to a CI failure

@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Jul 9, 2021
@codecov
Copy link

codecov bot commented Jul 9, 2021

Codecov Report

Merging #18532 (5be23b6) into v1.7 (5315a89) will decrease coverage by 0.0%.
The diff coverage is 85.1%.

@@            Coverage Diff            @@
##             v1.7   #18532     +/-   ##
=========================================
- Coverage    82.2%    82.2%   -0.1%     
=========================================
  Files         433      433             
  Lines      121519   121526      +7     
=========================================
- Hits        99996    99966     -30     
- Misses      21523    21560     +37     

@mergify mergify bot merged commit 7e613c7 into v1.7 Jul 9, 2021
@mergify mergify bot deleted the mergify/bp/v1.7/pr-18493 branch July 9, 2021 13:33
@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.

1 participant