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

v1.16: Support a custom path for the accounts hash cache (backport of #33115) #33120

Merged
merged 1 commit into from
Sep 2, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 1, 2023

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

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

You are currently cherry-picking commit d1b849972f.
  (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/accounts_db.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

@codecov
Copy link

codecov bot commented Sep 1, 2023

Codecov Report

Merging #33120 (c976676) into v1.16 (015e7c5) will increase coverage by 0.0%.
The diff coverage is n/a.

❗ Current head c976676 differs from pull request most recent head 4d11c94. Consider uploading reports for the commit 4d11c94 to get more accurate results

@@           Coverage Diff            @@
##            v1.16   #33120    +/-   ##
========================================
  Coverage    81.9%    81.9%            
========================================
  Files         762      762            
  Lines      207825   208129   +304     
========================================
+ Hits       170341   170634   +293     
- Misses      37484    37495    +11     

@t-nelson t-nelson force-pushed the mergify/bp/v1.16/pr-33115 branch from 4b56b04 to 9b608e1 Compare September 2, 2023 02:52
@t-nelson t-nelson force-pushed the mergify/bp/v1.16/pr-33115 branch from 9b608e1 to 4d11c94 Compare September 2, 2023 02:57
Copy link
Contributor

@brooksprumo brooksprumo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

@brooksprumo
Copy link
Contributor

(can I approve my own backport?)

@CriesofCarrots
Copy link
Contributor

(can I approve my own backport?)

vFu

@t-nelson
Copy link
Contributor

t-nelson commented Sep 2, 2023

(can I approve my own backport?)

backports are "mergify's" 😉

@t-nelson t-nelson added the automerge Merge this Pull Request automatically once CI passes label Sep 2, 2023
@mergify mergify bot merged commit b408cb6 into v1.16 Sep 2, 2023
@mergify mergify bot deleted the mergify/bp/v1.16/pr-33115 branch September 2, 2023 03:49
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.

3 participants