Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove rpc_banks from validator (bp #13882) #13905

Merged
merged 2 commits into from
Dec 2, 2020
Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 2, 2020

This is an automated backport of pull request #13882 done by Mergify

Cherry-pick of 10c81a2 has failed:

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

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

Changes to be committed:

	modified:   cli-config/src/config.rs
	modified:   core/src/cluster_info.rs
	modified:   core/src/contact_info.rs
	modified:   core/src/serve_repair.rs
	modified:   core/src/test_validator.rs
	modified:   local-cluster/src/local_cluster.rs
	modified:   validator/src/main.rs

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

	both modified:   core/src/validator.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 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/

* Remove rpc_banks from validator

* Bump abi-digest

(cherry picked from commit 10c81a2)

# Conflicts:
#	core/src/validator.rs
@mergify mergify bot added the conflicts label Dec 2, 2020
@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Dec 2, 2020
@codecov
Copy link

codecov bot commented Dec 2, 2020

Codecov Report

Merging #13905 (6539250) into v1.4 (311a1a3) will increase coverage by 0.0%.
The diff coverage is 89.6%.

@@          Coverage Diff           @@
##            v1.4   #13905   +/-   ##
======================================
  Coverage   82.1%    82.1%           
======================================
  Files        382      382           
  Lines      92755    92706   -49     
======================================
- Hits       76215    76186   -29     
+ Misses     16540    16520   -20     

@mergify mergify bot merged commit 72aa24d into v1.4 Dec 2, 2020
@mergify mergify bot deleted the mergify/bp/v1.4/pr-13882 branch December 2, 2020 04:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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