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

Add hash stats information to check hashes between validators (bp #7780) #7793

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 14, 2020

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

Cherry-pick of 3b78be8 has failed:

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

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

Changes to be committed:

	modified:   runtime/src/bank.rs

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

	both modified:   runtime/src/accounts.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 [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/

automerge

(cherry picked from commit 3b78be8)

# Conflicts:
#	runtime/src/accounts.rs
#	runtime/src/accounts_db.rs
@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Jan 14, 2020
@solana-grimes solana-grimes removed the automerge Merge this Pull Request automatically once CI passes label Jan 14, 2020
@solana-grimes
Copy link
Contributor

💔 Unable to automerge due to CI failure

@mvines
Copy link
Member

mvines commented Jan 15, 2020

@Mergifyio rebase

@mvines
Copy link
Member

mvines commented Jan 15, 2020

d9a5a86

@mvines mvines closed this Jan 15, 2020
@mergify
Copy link
Contributor Author

mergify bot commented Jan 15, 2020

Command rebase: failure

Branch rebase failed
First, rewinding head to replay your work on top of it...
Applying: Add hash stats information to check hashes between validators (#7780)
Using index info to reconstruct a base tree...
M runtime/src/accounts.rs
M runtime/src/accounts_db.rs
M runtime/src/bank.rs
Falling back to patching base and 3-way merge...
Auto-merging runtime/src/accounts_db.rs
CONFLICT (content): Merge conflict in runtime/src/accounts_db.rs
Auto-merging runtime/src/accounts.rs
CONFLICT (content): Merge conflict in runtime/src/accounts.rs
error: Failed to merge in the changes.
Patch failed at 0001 Add hash stats information to check hashes between validators (#7780)
Use 'git am --show-current-patch' to see the failed patch

Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".

err-code: 5A111

Hey, I reacted but my real name is @Mergifyio

@mergify mergify bot deleted the mergify/bp/v0.22/pr-7780 branch January 15, 2020 16:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants