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

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Jan 14, 2020

This is an automated backport of pull request #7777 done by Mergify.io

Cherry-pick of e6af451 has failed:

On branch mergify/bp/v0.21/pr-7777
Your branch is up to date with 'origin/v0.21'.

You are currently cherry-picking commit e6af4511a.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:

	modified:   core/src/contact_info.rs
	modified:   core/src/gossip_service.rs
	modified:   core/src/validator.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)

	both modified:   core/src/cluster_info.rs

To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

Mergify commands and options
More conditions and actions can be found in the [documention](https://doc.mergify.io/).

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
  • @Mergifyio backports <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 simulator.

Finally, you can contact us on https://mergify.io/

@codecov
Copy link

codecov bot commented Jan 14, 2020

Codecov Report

Merging #7799 into v0.21 will decrease coverage by 3.7%.
The diff coverage is 68.1%.

@@           Coverage Diff           @@
##           v0.21   #7799     +/-   ##
=======================================
- Coverage   59.5%   55.8%   -3.8%     
=======================================
  Files        239     239             
  Lines      62268   66395   +4127     
=======================================
- Hits       37084   37079      -5     
- Misses     25184   29316   +4132

(cherry picked from commit e6af451)
@mvines mvines force-pushed the mergify/bp/v0.21/pr-7777 branch from af3d02a to 748651e Compare January 15, 2020 00:57
@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Jan 15, 2020
@solana-grimes solana-grimes merged commit dfdb2ee into v0.21 Jan 15, 2020
@mergify mergify bot deleted the mergify/bp/v0.21/pr-7777 branch January 15, 2020 01:47
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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants