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

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Apr 30, 2020

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

Cherry-pick of 230df0e has failed:

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

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

Changes to be committed:

	modified:   ci/docker-rust-nightly/Dockerfile
	modified:   ci/docker-rust/Dockerfile
	modified:   ci/rust-version.sh
	modified:   ci/test-bench.sh
	modified:   logger/src/lib.rs

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

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

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

(cherry picked from commit 230df0e)

# Conflicts:
#	core/src/validator.rs
#	runtime/src/accounts_db.rs
@mergify mergify bot added conflicts automerge Merge this Pull Request automatically once CI passes labels Apr 30, 2020
@solana-grimes solana-grimes removed the automerge Merge this Pull Request automatically once CI passes label Apr 30, 2020
@solana-grimes
Copy link
Contributor

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

@codecov
Copy link

codecov bot commented Apr 30, 2020

Codecov Report

Merging #9807 into v1.0 will decrease coverage by 0.0%.
The diff coverage is n/a.

@@           Coverage Diff           @@
##            v1.0   #9807     +/-   ##
=======================================
- Coverage   80.2%   80.2%   -0.1%     
=======================================
  Files        269     269             
  Lines      59499   59397    -102     
=======================================
- Hits       47752   47649    -103     
- Misses     11747   11748      +1     

@mvines mvines merged commit b4933f4 into v1.0 Apr 30, 2020
@mvines mvines deleted the mergify/bp/v1.0/pr-9754 branch April 30, 2020 15:50
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants