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

Nits in message-processor (backport #21755) #21761

Merged
merged 3 commits into from
Dec 10, 2021
Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 10, 2021

This is an automatic backport of pull request #21755 done by Mergify.
Cherry-pick of c1386d6 has failed:

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

You are currently cherry-picking commit c1386d66e.
  (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)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   runtime/src/bank.rs
	both modified:   runtime/src/message_processor.rs

no changes added to commit (use "git add" and/or "git commit -a")

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.com

* Fixup typo

* Simplify types slightly

(cherry picked from commit c1386d6)

# Conflicts:
#	runtime/src/bank.rs
#	runtime/src/message_processor.rs
@mergify mergify bot added the conflicts label Dec 10, 2021
@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Dec 10, 2021
@solana-grimes solana-grimes removed the automerge Merge this Pull Request automatically once CI passes label Dec 10, 2021
@solana-grimes
Copy link
Contributor

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

@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 Dec 10, 2021
@mergify
Copy link
Contributor Author

mergify bot commented Dec 10, 2021

automerge label removed due to a CI failure

@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Dec 10, 2021
@mergify
Copy link
Contributor Author

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

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

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

mergify bot commented Dec 10, 2021

automerge label removed due to a CI failure

@CriesofCarrots
Copy link
Contributor

CriesofCarrots commented Dec 10, 2021

Not sure what's going on here. This passes locally, and the failures look like failures I've seen before with a bad build cache. But I haven't been able to get green yet.

(edit) gonna make it! xmas miracle

@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Dec 10, 2021
@mergify mergify bot merged commit 87c7164 into v1.8 Dec 10, 2021
@mergify mergify bot deleted the mergify/bp/v1.8/pr-21755 branch December 10, 2021 21:21
t-nelson added a commit to t-nelson/solana that referenced this pull request Dec 13, 2021
tao-stones pushed a commit that referenced this pull request Dec 13, 2021
CriesofCarrots pushed a commit to CriesofCarrots/solana that referenced this pull request Dec 16, 2021
CriesofCarrots pushed a commit that referenced this pull request Dec 17, 2021
@github-actions
Copy link
Contributor

github-actions bot commented Apr 5, 2022

This PR has been automatically locked since there has not been any activity in past 14 days after it was merged.

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Apr 5, 2022
@mergify mergify bot removed the automerge Merge this Pull Request automatically once CI passes label Apr 5, 2022
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