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

Fix bank executor stats and remove copy-on-write semantics (backport #25621) #25782

Merged
merged 2 commits into from
Jun 4, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 4, 2022

This is an automatic backport of pull request #25621 done by Mergify.
Cherry-pick of 61ad8fc has failed:

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

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

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

* Fix bank executor stats and remove copy-on-write semantics

* Remove clone implementation for CachedExecutors

* feedback

(cherry picked from commit 61ad8fc)

# Conflicts:
#	runtime/src/bank.rs
@mergify mergify bot added the conflicts label Jun 4, 2022
@mergify mergify bot assigned jstarry Jun 4, 2022
@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Jun 4, 2022
@mergify
Copy link
Contributor Author

mergify bot commented Jun 4, 2022

automerge label removed due to a CI failure

@mergify mergify bot removed the automerge Merge this Pull Request automatically once CI passes label Jun 4, 2022
@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Jun 4, 2022
@mergify mergify bot merged commit 9a07547 into v1.9 Jun 4, 2022
@mergify mergify bot deleted the mergify/bp/v1.9/pr-25621 branch June 4, 2022 17:12
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